From 6a7cc3182e540cefec1d3459ac59d7b195c5b058 Mon Sep 17 00:00:00 2001 From: Michael Stahnke Date: Sun, 25 Mar 2007 19:08:49 +0000 Subject: [PATCH 01/31] auto-import epel-release-4-4 on branch devel from epel-release-4-4.src.rpm --- GPL | 347 ++++++++++++++++++++++++++++++++++++++++++++++ RPM-GPG-KEY-EPEL | 30 ++++ epel-release.spec | 82 +++++++++++ epel-testing.repo | 26 ++++ epel.repo | 26 ++++ 5 files changed, 511 insertions(+) create mode 100644 GPL create mode 100644 RPM-GPG-KEY-EPEL create mode 100644 epel-release.spec create mode 100644 epel-testing.repo create mode 100644 epel.repo 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/RPM-GPG-KEY-EPEL b/RPM-GPG-KEY-EPEL new file mode 100644 index 0000000..5a13bb4 --- /dev/null +++ b/RPM-GPG-KEY-EPEL @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.2.6 (GNU/Linux) + +mQGiBEXopTIRBACZDBMOoFOakAjaxw1LXjeSvh/kmE35fU1rXfM7T0AV31NATCLF +l5CQiNDA4oWreDThg2Bf6+LIVTsGQb1V+XXuLak4Em5yTYwMTVB//4/nMxQEbpl/ +QB2XwlJ7EQ0vW+kiPDz/7pHJz1p1jADzd9sQQicMtzysS4qT2i5A23j0VwCg1PB/ +lpYqo0ZhWTrevxKMa1n34FcD/REavj0hSLQFTaKNLHRotRTF8V0BajjSaTkUT4uk +/RTaZ8Kr1mTosVtosqmdIAA2XHxi8ZLiVPPSezJjfElsSqOAxEKPL0djfpp2wrTm +l/1iVnX+PZH5DRKCbjdCMLDJhYap7YUhcPsMGSeUKrwmBCBJUPc6DhjFvyhA9IMl +1T0+A/9SKTv94ToP/JYoCTHTgnG5MoVNafisfe0wojP2mWU4gRk8X4dNGKMj6lic +vM6gne3hESyjcqZSmr7yELPPGhI9MNauJ6Ob8cTR2T12Fmv9w03DD3MnBstR6vhP +QcqZKhc5SJYYY7oVfxlSOfF4xfwcHQKoD5TOKwIAQ6T8jyFpKbQkRmVkb3JhIEVQ +RUwgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iGQEExECACQFAkXopTICGwMFCRLM +AwAGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQEZzANiF1IfabmQCgzvE60MnHSOBa +ZXXF7uU2Vzu8EOkAoKg9h+j0NuNom6WUYZyJQt4zc5seuQINBEXopTYQCADapnR/ +blrJ8FhlgNPl0X9S3JE/kygPbNXIqne4XBVYisVp0uzNCRUxNZq30MpY027JCs2J +nL2fMpwvx33f0phU029vrIZKA3CmnnwVsjcWfMJOVPBmVN7m5bGU68F+PdRIcDsl +PMOWRLkTBZOGolLgIbM4719fqA8etewILrX6uPvRDwywV7/sPCFpRcfNNBUY+Zx3 +5bf4fnkaCKxgXgQS3AT+hGYhlzIqQVTkGNveHTnt4SSzgAqR9sSwQwqvEfVtYNeS +w5rDguLG41HQm1Hojv59HNYjH6F/S1rClZi21bLgZbKpCFX76qPt8CTw+iQLBPPd +yoOGHfzyp7nsfhUrAAMFB/9/H9Gpk822ZpBexQW4y3LGFo9ZSnmu+ueOZPU3SqDA +DW1ovZdYzGuJTGGM9oMl6bL8eZrcUBBOFaWge5wZczIE3hx2exEOkDdvq+MUDVD1 +axmN45q/7h1NYRp5GQL2ZsoV4g9U2gMdzHOFtZCER6PP9ErVlfJpgBUCdSL93V4H +Sgpkk7znmTOklbCM6l/G/A6q4sCRqfzHwVSTiruyTBiU9lfROsAl8fjIq2OzWJ2T +P9sadBe1llUYaow7txYSUxssW+89avct35gIyrBbof5M+CBXyAOUaSWmpM2eub24 +0qbqiSr/Y6Om0t6vSzR8gRk7g+1H6IE0Tt1IJCvCAMimiE8EGBECAA8FAkXopTYC +GwwFCRLMAwAACgkQEZzANiF1IfZQYgCgiZHCv4xb+sTHCn/otc1Ovvi/OgMAnRXY +bbsLFWOfmzAnNIGvFRWy+YHi +=MMNL +-----END PGP PUBLIC KEY BLOCK----- diff --git a/epel-release.spec b/epel-release.spec new file mode 100644 index 0000000..c62563e --- /dev/null +++ b/epel-release.spec @@ -0,0 +1,82 @@ +Name: epel-release +Version: 4 +Release: 4 +Summary: Extra Packages for Enterprise Linux repository configuration + +Group: System Environment/Base +License: GPL + +# This is a Red Hat maintained package which is specific to +# our distribution. Thus the source is only available from +# within this srpm. +URL: http://download.fedora.redhat.com/pub/epel +Source0: http://download.fedora.redhat.com/pub/epel/RPM-GPG-KEY-EPEL +Source1: GPL +Source2: epel.repo +Source3: epel-testing.repo + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch +Requires: redhat-release >= %{version} + +%description +This package contains the Extra Packages for Enterprise Linux (EPEL) repository +GPG key as well as configuration for yum and up2date. + +%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 + +# yum +install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d +install -pm 644 %{SOURCE2} %{SOURCE3} \ + $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +echo "# epel repo -- added by epel-release " \ + >> %{_sysconfdir}/sysconfig/rhn/sources +echo "yum epel http://download.fedora.redhat.com/pub/epel/%{version}/\$ARCH" \ + >> %{_sysconfdir}/sysconfig/rhn/sources + +%postun +sed -i '/^yum\ epel/d' %{_sysconfdir}/sysconfig/rhn/sources +sed -i '/^\#\ epel\ repo\ /d' %{_sysconfdir}/sysconfig/rhn/sources + + +%files +%defattr(-,root,root,-) +%doc GPL +%config(noreplace) /etc/yum.repos.d/* +/etc/pki/rpm-gpg/* + + +%changelog +* Sun Mar 25 2007 Michael Stahnke - 4-4 +- Changed description again + +* Sun Mar 25 2007 Michael Stahnke - 4-3 +- Removed cp in postun +- Removed the file epel-release - provides no value +- Removed dist tag as per review bug #233236 +- Changed description + +* Mon Mar 14 2007 Michael Stahnke - 4-2 +- Fixed up2date issues. + +* Mon Mar 12 2007 Michael Stahnke - 4-1 +- Initial Package diff --git a/epel-testing.repo b/epel-testing.repo new file mode 100644 index 0000000..9f542e0 --- /dev/null +++ b/epel-testing.repo @@ -0,0 +1,26 @@ +[epel-testing] +name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch +baseurl= + http://download.fedora.redhat.com/pub/epel/testing/$releasever/$basearch +failovermethod=priority +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL + +[epel-testing-debuginfo] +name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Debug +baseurl= + http://download.fedora.redhat.com/pub/epel/testing/$releasever/$basearch/debug +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL +gpgcheck=1 + +[epel-source] +name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Source +baseurl= + http://download.fedora.redhat.com/pub/epel/$releasever/SRPMS +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL +gpgcheck=1 diff --git a/epel.repo b/epel.repo new file mode 100644 index 0000000..baf649b --- /dev/null +++ b/epel.repo @@ -0,0 +1,26 @@ +[epel] +name=Extra Packages for Enterprise Linux $releasever - $basearch +#baseurl=http://download.fedora.redhat.com/pub/epel/$releasever/$basearch +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-$releasever&arch=$basearch +failovermethod=priority +enabled=1 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL + +[epel-debuginfo] +name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug +#baseurl=http://download.fedora.redhat.com/pub/epel/$releasever/$basearch/debug +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-$releasever&arch=$basearch +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL +gpgcheck=1 + +[epel-source] +name=Extra Packages for Enterprise Linux $releasever - $basearch - Source +#baseurl=http://download.fedora.redhat.com/pub/epel/$releasever/SRPMS +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-$releasever&arch=$basearch +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL +gpgcheck=1 From 749bf87c3eaf5a08375c953089431e69230552a0 Mon Sep 17 00:00:00 2001 From: Michael Stahnke Date: Sun, 25 Mar 2007 20:10:17 +0000 Subject: [PATCH 02/31] Modified for RHEL 6 -- (This is devel) --- epel-release.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/epel-release.spec b/epel-release.spec index c62563e..741c51d 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release -Version: 4 -Release: 4 +Version: 6 +Release: 0 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -66,6 +66,9 @@ sed -i '/^\#\ epel\ repo\ /d' %{_sysconfdir}/sysconfig/rhn/sources %changelog +* Sun Mar 25 2007 Michael Stahnke - 6-0 +- Bumped in devel to RHEL 6. (We can dream). + * Sun Mar 25 2007 Michael Stahnke - 4-4 - Changed description again From 0abe3f4d9e8ee77426571c16a1fd80ffc09dff8e Mon Sep 17 00:00:00 2001 From: Michael Stahnke Date: Tue, 3 Apr 2007 04:58:29 +0000 Subject: [PATCH 03/31] Crazy changes for EPEL devel branch, which would seem to be RHEL 6. --- epel-testing.repo | 17 +++++++---------- epel.repo | 18 +++++++++--------- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/epel-testing.repo b/epel-testing.repo index 9f542e0..bc30769 100644 --- a/epel-testing.repo +++ b/epel-testing.repo @@ -1,25 +1,22 @@ [epel-testing] -name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch -baseurl= - http://download.fedora.redhat.com/pub/epel/testing/$releasever/$basearch +name=Extra Packages for Enterprise Linux 6 - Testing - $basearch +baseurl=http://download.fedora.redhat.com/pub/epel/testing/6/$basearch failovermethod=priority enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL [epel-testing-debuginfo] -name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Debug -baseurl= - http://download.fedora.redhat.com/pub/epel/testing/$releasever/$basearch/debug +name=Extra Packages for Enterprise Linux 6 - Testing - $basearch - Debug +baseurl=http://download.fedora.redhat.com/pub/epel/testing/6/$basearch/debug failovermethod=priority enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL gpgcheck=1 -[epel-source] -name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Source -baseurl= - http://download.fedora.redhat.com/pub/epel/$releasever/SRPMS +[epel-testing-source] +name=Extra Packages for Enterprise Linux 6 - Testing - $basearch - Source +baseurl=http://download.fedora.redhat.com/pub/epel/testing/6/SRPMS failovermethod=priority enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL diff --git a/epel.repo b/epel.repo index baf649b..01afb5d 100644 --- a/epel.repo +++ b/epel.repo @@ -1,25 +1,25 @@ [epel] -name=Extra Packages for Enterprise Linux $releasever - $basearch -#baseurl=http://download.fedora.redhat.com/pub/epel/$releasever/$basearch -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-$releasever&arch=$basearch +name=Extra Packages for Enterprise Linux 6 - $basearch +#baseurl=http://download.fedora.redhat.com/pub/epel/6/$basearch +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=$basearch failovermethod=priority enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL [epel-debuginfo] -name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug -#baseurl=http://download.fedora.redhat.com/pub/epel/$releasever/$basearch/debug -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-$releasever&arch=$basearch +name=Extra Packages for Enterprise Linux 6 - $basearch - Debug +#baseurl=http://download.fedora.redhat.com/pub/epel/6/$basearch/debug +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-6&arch=$basearch failovermethod=priority enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL gpgcheck=1 [epel-source] -name=Extra Packages for Enterprise Linux $releasever - $basearch - Source -#baseurl=http://download.fedora.redhat.com/pub/epel/$releasever/SRPMS -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-$releasever&arch=$basearch +name=Extra Packages for Enterprise Linux 6 - $basearch - Source +#baseurl=http://download.fedora.redhat.com/pub/epel/6/SRPMS +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-6&arch=$basearch failovermethod=priority enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL From c3373e3549a0e73b2560a21f96a62957e284eef8 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 17 Jul 2008 20:08:11 +0000 Subject: [PATCH 04/31] fix license tag --- epel-release.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/epel-release.spec b/epel-release.spec index 741c51d..5d31cc3 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,10 +1,10 @@ Name: epel-release Version: 6 -Release: 0 +Release: 1 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base -License: GPL +License: GPLv2 # This is a Red Hat maintained package which is specific to # our distribution. Thus the source is only available from @@ -66,6 +66,9 @@ sed -i '/^\#\ epel\ repo\ /d' %{_sysconfdir}/sysconfig/rhn/sources %changelog +* Thu Jul 17 2008 Tom "spot" Callaway - 6.1 +- fix license tag + * Sun Mar 25 2007 Michael Stahnke - 6-0 - Bumped in devel to RHEL 6. (We can dream). From 0ad6bc00200e264e099aef6db751a44aab0b1d05 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 24 Feb 2009 15:13:01 +0000 Subject: [PATCH 05/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- epel-release.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/epel-release.spec b/epel-release.spec index 5d31cc3..ec0b31f 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 6 -Release: 1 +Release: 2 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -66,6 +66,9 @@ sed -i '/^\#\ epel\ repo\ /d' %{_sysconfdir}/sysconfig/rhn/sources %changelog +* Tue Feb 24 2009 Fedora Release Engineering - 6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Jul 17 2008 Tom "spot" Callaway - 6.1 - fix license tag From e33c4a962081c06367a0eaf55abe2b6daf930f2e Mon Sep 17 00:00:00 2001 From: Michael Stahnke Date: Tue, 14 Jul 2009 17:31:31 +0000 Subject: [PATCH 06/31] Marking epel-release as invalid in devel --- GPL | 347 ---------------------------------------------- RPM-GPG-KEY-EPEL | 30 ---- dead.package | 1 + epel-testing.repo | 23 --- epel.repo | 26 ---- 5 files changed, 1 insertion(+), 426 deletions(-) delete mode 100644 GPL delete mode 100644 RPM-GPG-KEY-EPEL create mode 100644 dead.package delete mode 100644 epel-testing.repo delete mode 100644 epel.repo diff --git a/GPL b/GPL deleted file mode 100644 index fd8bee7..0000000 --- a/GPL +++ /dev/null @@ -1,347 +0,0 @@ -***************************************************************************** -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/RPM-GPG-KEY-EPEL b/RPM-GPG-KEY-EPEL deleted file mode 100644 index 5a13bb4..0000000 --- a/RPM-GPG-KEY-EPEL +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) - -mQGiBEXopTIRBACZDBMOoFOakAjaxw1LXjeSvh/kmE35fU1rXfM7T0AV31NATCLF -l5CQiNDA4oWreDThg2Bf6+LIVTsGQb1V+XXuLak4Em5yTYwMTVB//4/nMxQEbpl/ -QB2XwlJ7EQ0vW+kiPDz/7pHJz1p1jADzd9sQQicMtzysS4qT2i5A23j0VwCg1PB/ -lpYqo0ZhWTrevxKMa1n34FcD/REavj0hSLQFTaKNLHRotRTF8V0BajjSaTkUT4uk -/RTaZ8Kr1mTosVtosqmdIAA2XHxi8ZLiVPPSezJjfElsSqOAxEKPL0djfpp2wrTm -l/1iVnX+PZH5DRKCbjdCMLDJhYap7YUhcPsMGSeUKrwmBCBJUPc6DhjFvyhA9IMl -1T0+A/9SKTv94ToP/JYoCTHTgnG5MoVNafisfe0wojP2mWU4gRk8X4dNGKMj6lic -vM6gne3hESyjcqZSmr7yELPPGhI9MNauJ6Ob8cTR2T12Fmv9w03DD3MnBstR6vhP -QcqZKhc5SJYYY7oVfxlSOfF4xfwcHQKoD5TOKwIAQ6T8jyFpKbQkRmVkb3JhIEVQ -RUwgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iGQEExECACQFAkXopTICGwMFCRLM -AwAGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQEZzANiF1IfabmQCgzvE60MnHSOBa -ZXXF7uU2Vzu8EOkAoKg9h+j0NuNom6WUYZyJQt4zc5seuQINBEXopTYQCADapnR/ -blrJ8FhlgNPl0X9S3JE/kygPbNXIqne4XBVYisVp0uzNCRUxNZq30MpY027JCs2J -nL2fMpwvx33f0phU029vrIZKA3CmnnwVsjcWfMJOVPBmVN7m5bGU68F+PdRIcDsl -PMOWRLkTBZOGolLgIbM4719fqA8etewILrX6uPvRDwywV7/sPCFpRcfNNBUY+Zx3 -5bf4fnkaCKxgXgQS3AT+hGYhlzIqQVTkGNveHTnt4SSzgAqR9sSwQwqvEfVtYNeS -w5rDguLG41HQm1Hojv59HNYjH6F/S1rClZi21bLgZbKpCFX76qPt8CTw+iQLBPPd -yoOGHfzyp7nsfhUrAAMFB/9/H9Gpk822ZpBexQW4y3LGFo9ZSnmu+ueOZPU3SqDA -DW1ovZdYzGuJTGGM9oMl6bL8eZrcUBBOFaWge5wZczIE3hx2exEOkDdvq+MUDVD1 -axmN45q/7h1NYRp5GQL2ZsoV4g9U2gMdzHOFtZCER6PP9ErVlfJpgBUCdSL93V4H -Sgpkk7znmTOklbCM6l/G/A6q4sCRqfzHwVSTiruyTBiU9lfROsAl8fjIq2OzWJ2T -P9sadBe1llUYaow7txYSUxssW+89avct35gIyrBbof5M+CBXyAOUaSWmpM2eub24 -0qbqiSr/Y6Om0t6vSzR8gRk7g+1H6IE0Tt1IJCvCAMimiE8EGBECAA8FAkXopTYC -GwwFCRLMAwAACgkQEZzANiF1IfZQYgCgiZHCv4xb+sTHCn/otc1Ovvi/OgMAnRXY -bbsLFWOfmzAnNIGvFRWy+YHi -=MMNL ------END PGP PUBLIC KEY BLOCK----- diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..3974481 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +epel-release does not need to be in devel branch. Is obviously only used for EPEL and not rawhide. diff --git a/epel-testing.repo b/epel-testing.repo deleted file mode 100644 index bc30769..0000000 --- a/epel-testing.repo +++ /dev/null @@ -1,23 +0,0 @@ -[epel-testing] -name=Extra Packages for Enterprise Linux 6 - Testing - $basearch -baseurl=http://download.fedora.redhat.com/pub/epel/testing/6/$basearch -failovermethod=priority -enabled=0 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL - -[epel-testing-debuginfo] -name=Extra Packages for Enterprise Linux 6 - Testing - $basearch - Debug -baseurl=http://download.fedora.redhat.com/pub/epel/testing/6/$basearch/debug -failovermethod=priority -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL -gpgcheck=1 - -[epel-testing-source] -name=Extra Packages for Enterprise Linux 6 - Testing - $basearch - Source -baseurl=http://download.fedora.redhat.com/pub/epel/testing/6/SRPMS -failovermethod=priority -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL -gpgcheck=1 diff --git a/epel.repo b/epel.repo deleted file mode 100644 index 01afb5d..0000000 --- a/epel.repo +++ /dev/null @@ -1,26 +0,0 @@ -[epel] -name=Extra Packages for Enterprise Linux 6 - $basearch -#baseurl=http://download.fedora.redhat.com/pub/epel/6/$basearch -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=$basearch -failovermethod=priority -enabled=1 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL - -[epel-debuginfo] -name=Extra Packages for Enterprise Linux 6 - $basearch - Debug -#baseurl=http://download.fedora.redhat.com/pub/epel/6/$basearch/debug -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-6&arch=$basearch -failovermethod=priority -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL -gpgcheck=1 - -[epel-source] -name=Extra Packages for Enterprise Linux 6 - $basearch - Source -#baseurl=http://download.fedora.redhat.com/pub/epel/6/SRPMS -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-6&arch=$basearch -failovermethod=priority -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL -gpgcheck=1 From 7fbdb018a17ff9827f03e0e6ef50ecbb8c5cae22 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:50:03 +0000 Subject: [PATCH 07/31] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b8e65af..603fff4 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: epel-release -# $Id$ +# $Id: Makefile,v 1.1 2007/03/25 17:28:28 ausil Exp $ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 69b7ec8515b2137e909f5ff60b655b1d009bab7a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 13:50:37 +0000 Subject: [PATCH 08/31] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 603fff4..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: epel-release -# $Id: Makefile,v 1.1 2007/03/25 17:28:28 ausil Exp $ -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 $$d/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) From ab3337ecc35e93ca3d5203d1495fa93a42a02bb1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 15 Dec 2013 21:50:20 -0600 Subject: [PATCH 09/31] setup for epel7 --- RPM-GPG-KEY-EPEL-7 | 29 +++++++++++++++++++++++++++++ dead.package | 1 - epel-release.spec | 40 +++++++++------------------------------- epel-testing.repo | 26 ++++++++++++++++++++++++++ epel.repo | 26 ++++++++++++++++++++++++++ 5 files changed, 90 insertions(+), 32 deletions(-) create mode 100644 RPM-GPG-KEY-EPEL-7 delete mode 100644 dead.package create mode 100644 epel-testing.repo create mode 100644 epel.repo diff --git a/RPM-GPG-KEY-EPEL-7 b/RPM-GPG-KEY-EPEL-7 new file mode 100644 index 0000000..f205ede --- /dev/null +++ b/RPM-GPG-KEY-EPEL-7 @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.11 (GNU/Linux) + +mQINBFKuaIQBEAC1UphXwMqCAarPUH/ZsOFslabeTVO2pDk5YnO96f+rgZB7xArB +OSeQk7B90iqSJ85/c72OAn4OXYvT63gfCeXpJs5M7emXkPsNQWWSju99lW+AqSNm +jYWhmRlLRGl0OO7gIwj776dIXvcMNFlzSPj00N2xAqjMbjlnV2n2abAE5gq6VpqP +vFXVyfrVa/ualogDVmf6h2t4Rdpifq8qTHsHFU3xpCz+T6/dGWKGQ42ZQfTaLnDM +jToAsmY0AyevkIbX6iZVtzGvanYpPcWW4X0RDPcpqfFNZk643xI4lsZ+Y2Er9Yu5 +S/8x0ly+tmmIokaE0wwbdUu740YTZjCesroYWiRg5zuQ2xfKxJoV5E+Eh+tYwGDJ +n6HfWhRgnudRRwvuJ45ztYVtKulKw8QQpd2STWrcQQDJaRWmnMooX/PATTjCBExB +9dkz38Druvk7IkHMtsIqlkAOQMdsX1d3Tov6BE2XDjIG0zFxLduJGbVwc/6rIc95 +T055j36Ez0HrjxdpTGOOHxRqMK5m9flFbaxxtDnS7w77WqzW7HjFrD0VeTx2vnjj +GqchHEQpfDpFOzb8LTFhgYidyRNUflQY35WLOzLNV+pV3eQ3Jg11UFwelSNLqfQf +uFRGc+zcwkNjHh5yPvm9odR1BIfqJ6sKGPGbtPNXo7ERMRypWyRz0zi0twARAQAB +tChGZWRvcmEgRVBFTCAoNykgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iQI4BBMB +AgAiBQJSrmiEAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRBqL66iNSxk +5cfGD/4spqpsTjtDM7qpytKLHKruZtvuWiqt5RfvT9ww9GUUFMZ4ZZGX4nUXg49q +ixDLayWR8ddG/s5kyOi3C0uX/6inzaYyRg+Bh70brqKUK14F1BrrPi29eaKfG+Gu +MFtXdBG2a7OtPmw3yuKmq9Epv6B0mP6E5KSdvSRSqJWtGcA6wRS/wDzXJENHp5re +9Ism3CYydpy0GLRA5wo4fPB5uLdUhLEUDvh2KK//fMjja3o0L+SNz8N0aDZyn5Ax +CU9RB3EHcTecFgoy5umRj99BZrebR1NO+4gBrivIfdvD4fJNfNBHXwhSH9ACGCNv +HnXVjHQF9iHWApKkRIeh8Fr2n5dtfJEF7SEX8GbX7FbsWo29kXMrVgNqHNyDnfAB +VoPubgQdtJZJkVZAkaHrMu8AytwT62Q4eNqmJI1aWbZQNI5jWYqc6RKuCK6/F99q +thFT9gJO17+yRuL6Uv2/vgzVR1RGdwVLKwlUjGPAjYflpCQwWMAASxiv9uPyYPHc +ErSrbRG0wjIfAR3vus1OSOx3xZHZpXFfmQTsDP7zVROLzV98R3JwFAxJ4/xqeON4 +vCPFU6OsT3lWQ8w7il5ohY95wmujfr6lk89kEzJdOTzcn7DBbUru33CQMGKZ3Evt +RjsC7FDbL017qxS+ZVA/HGkyfiu4cpgV8VUnbql5eAZ+1Ll6Dw== +=hdPa +-----END PGP PUBLIC KEY BLOCK----- diff --git a/dead.package b/dead.package deleted file mode 100644 index 3974481..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -epel-release does not need to be in devel branch. Is obviously only used for EPEL and not rawhide. diff --git a/epel-release.spec b/epel-release.spec index ec0b31f..a8bced1 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release -Version: 6 -Release: 2 +Version: 7 +Release: 0.1 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -9,14 +9,12 @@ License: GPLv2 # This is a Red Hat maintained package which is specific to # our distribution. Thus the source is only available from # within this srpm. -URL: http://download.fedora.redhat.com/pub/epel -Source0: http://download.fedora.redhat.com/pub/epel/RPM-GPG-KEY-EPEL +URL: http://download.fedoraproject.org/pub/epel +Source0: http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 Source1: GPL Source2: epel.repo Source3: epel-testing.repo -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - BuildArch: noarch Requires: redhat-release >= %{version} @@ -37,7 +35,7 @@ rm -rf $RPM_BUILD_ROOT #GPG Key install -Dpm 644 %{SOURCE0} \ - $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-EPEL + $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 # yum install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d @@ -50,7 +48,7 @@ rm -rf $RPM_BUILD_ROOT %post echo "# epel repo -- added by epel-release " \ >> %{_sysconfdir}/sysconfig/rhn/sources -echo "yum epel http://download.fedora.redhat.com/pub/epel/%{version}/\$ARCH" \ +echo "yum epel http://download.fedoraproject.org/pub/epel/%{version}/\$ARCH" \ >> %{_sysconfdir}/sysconfig/rhn/sources %postun @@ -61,31 +59,11 @@ sed -i '/^\#\ epel\ repo\ /d' %{_sysconfdir}/sysconfig/rhn/sources %files %defattr(-,root,root,-) %doc GPL -%config(noreplace) /etc/yum.repos.d/* +%config /etc/yum.repos.d/* /etc/pki/rpm-gpg/* %changelog -* Tue Feb 24 2009 Fedora Release Engineering - 6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Mon Dec 16 2013 Dennis Gilmore - 7-0.1 +- initial epel 7 build. gpg cheking is disabled -* Thu Jul 17 2008 Tom "spot" Callaway - 6.1 -- fix license tag - -* Sun Mar 25 2007 Michael Stahnke - 6-0 -- Bumped in devel to RHEL 6. (We can dream). - -* Sun Mar 25 2007 Michael Stahnke - 4-4 -- Changed description again - -* Sun Mar 25 2007 Michael Stahnke - 4-3 -- Removed cp in postun -- Removed the file epel-release - provides no value -- Removed dist tag as per review bug #233236 -- Changed description - -* Mon Mar 14 2007 Michael Stahnke - 4-2 -- Fixed up2date issues. - -* Mon Mar 12 2007 Michael Stahnke - 4-1 -- Initial Package diff --git a/epel-testing.repo b/epel-testing.repo new file mode 100644 index 0000000..3149d51 --- /dev/null +++ b/epel-testing.repo @@ -0,0 +1,26 @@ +[epel-testing] +name=Extra Packages for Enterprise Linux 7 - Testing - $basearch +#baseurl=http://download.fedoraproject.org/pub/epel/testing/7/$basearch +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=testing-epel7&arch=$basearch +failovermethod=priority +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 + +[epel-testing-debuginfo] +name=Extra Packages for Enterprise Linux 7 - Testing - $basearch - Debug +#baseurl=http://download.fedoraproject.org/pub/epel/testing/7/$basearch/debug +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel7&arch=$basearch +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 +gpgcheck=1 + +[epel-testing-source] +name=Extra Packages for Enterprise Linux 7 - Testing - $basearch - Source +#baseurl=http://download.fedoraproject.org/pub/epel/testing/7/SRPMS +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel7&arch=$basearch +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 +gpgcheck=1 diff --git a/epel.repo b/epel.repo new file mode 100644 index 0000000..9fb64ec --- /dev/null +++ b/epel.repo @@ -0,0 +1,26 @@ +[epel] +name=Extra Packages for Enterprise Linux 7 - $basearch +#baseurl=http://download.fedoraproject.org/pub/epel/7/$basearch +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch +failovermethod=priority +enabled=1 +gpgcheck=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 + +[epel-debuginfo] +name=Extra Packages for Enterprise Linux 7 - $basearch - Debug +#baseurl=http://download.fedoraproject.org/pub/epel/7/$basearch/debug +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-7&arch=$basearch +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 +gpgcheck=1 + +[epel-source] +name=Extra Packages for Enterprise Linux 7 - $basearch - Source +#baseurl=http://download.fedoraproject.org/pub/epel/7/SRPMS +mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-source-7&arch=$basearch +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 +gpgcheck=1 From b3e42ddda56877e8e46b932d632a9dfcc5f8cbed Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 15 Dec 2013 22:32:04 -0600 Subject: [PATCH 10/31] add missing GPL file --- GPL | 347 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 347 insertions(+) create mode 100644 GPL 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. From 6be759d0c78f1538f553d46fcf984b871162ded9 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 18 Jun 2014 17:19:29 -0600 Subject: [PATCH 11/31] Drop unneeded up2date post/postun - Fixed up description. - Fixes bugs #1052434 and #1093918 --- epel-release.spec | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/epel-release.spec b/epel-release.spec index a8bced1..2efa51d 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,12 +1,12 @@ Name: epel-release Version: 7 -Release: 0.1 +Release: 0.2 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base License: GPLv2 -# This is a Red Hat maintained package which is specific to +# 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 @@ -20,7 +20,7 @@ Requires: redhat-release >= %{version} %description This package contains the Extra Packages for Enterprise Linux (EPEL) repository -GPG key as well as configuration for yum and up2date. +GPG key as well as configuration for yum. %prep %setup -q -c -T @@ -45,17 +45,6 @@ install -pm 644 %{SOURCE2} %{SOURCE3} \ %clean rm -rf $RPM_BUILD_ROOT -%post -echo "# epel repo -- added by epel-release " \ - >> %{_sysconfdir}/sysconfig/rhn/sources -echo "yum epel http://download.fedoraproject.org/pub/epel/%{version}/\$ARCH" \ - >> %{_sysconfdir}/sysconfig/rhn/sources - -%postun -sed -i '/^yum\ epel/d' %{_sysconfdir}/sysconfig/rhn/sources -sed -i '/^\#\ epel\ repo\ /d' %{_sysconfdir}/sysconfig/rhn/sources - - %files %defattr(-,root,root,-) %doc GPL @@ -64,6 +53,11 @@ sed -i '/^\#\ epel\ repo\ /d' %{_sysconfdir}/sysconfig/rhn/sources %changelog +* 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 From 9ab4f2433d028626bd188cbbad240b86a7fded60 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 28 Aug 2014 16:57:53 -0500 Subject: [PATCH 12/31] enable gpg checking now we are out of beta --- epel-release.spec | 5 ++++- epel.repo | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/epel-release.spec b/epel-release.spec index 2efa51d..c1057b1 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 7 -Release: 0.2 +Release: 1 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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. diff --git a/epel.repo b/epel.repo index 9fb64ec..c3a643e 100644 --- a/epel.repo +++ b/epel.repo @@ -4,7 +4,7 @@ name=Extra Packages for Enterprise Linux 7 - $basearch mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch failovermethod=priority enabled=1 -gpgcheck=0 +gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 [epel-debuginfo] From 6d367a09832688dde826e1934f9c507affbb9253 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 2 Sep 2014 10:12:08 -0600 Subject: [PATCH 13/31] Make repo files config(noreplace). Fixes bug #1135576 --- epel-release.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/epel-release.spec b/epel-release.spec index c1057b1..9427b01 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 7 -Release: 1 +Release: 2 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -48,11 +48,14 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc GPL -%config /etc/yum.repos.d/* +%config(noreplace) /etc/yum.repos.d/* /etc/pki/rpm-gpg/* %changelog +* 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 From 8c5e10514c9a6ba831b3ceb746e97ba9793af282 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 21 Nov 2014 13:00:32 -0600 Subject: [PATCH 14/31] fix trailing whitespace --- epel-release.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/epel-release.spec b/epel-release.spec index 9427b01..adfc89e 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,9 +1,9 @@ -Name: epel-release +Name: epel-release Version: 7 Release: 2 Summary: Extra Packages for Enterprise Linux repository configuration -Group: System Environment/Base +Group: System Environment/Base License: GPLv2 # This is a EPEL maintained package which is specific to @@ -11,12 +11,12 @@ License: GPLv2 # within this srpm. URL: http://download.fedoraproject.org/pub/epel Source0: http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 -Source1: GPL -Source2: epel.repo -Source3: epel-testing.repo +Source1: GPL +Source2: epel.repo +Source3: epel-testing.repo BuildArch: noarch -Requires: redhat-release >= %{version} +Requires: redhat-release >= %{version} %description This package contains the Extra Packages for Enterprise Linux (EPEL) repository From 55ae955da0cc293682667e9c9a7efe1071176767 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 21 Nov 2014 13:04:01 -0600 Subject: [PATCH 15/31] implement %epel macro --- epel-release.spec | 9 +++++++-- macros.epel | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 macros.epel diff --git a/epel-release.spec b/epel-release.spec index adfc89e..b02362f 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 7 -Release: 2 +Release: 3 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -14,6 +14,7 @@ Source0: http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 Source1: GPL Source2: epel.repo Source3: epel-testing.repo +Source4: macros.epel BuildArch: noarch Requires: redhat-release >= %{version} @@ -41,6 +42,7 @@ install -Dpm 644 %{SOURCE0} \ install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d install -pm 644 %{SOURCE2} %{SOURCE3} \ $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d +install -pm 644 -D %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/rpm/macros.d/macros.epel %clean rm -rf $RPM_BUILD_ROOT @@ -50,9 +52,12 @@ rm -rf $RPM_BUILD_ROOT %doc GPL %config(noreplace) /etc/yum.repos.d/* /etc/pki/rpm-gpg/* - +/usr/lib/rpm/macros.d/macros.epel %changelog +* 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 diff --git a/macros.epel b/macros.epel new file mode 100644 index 0000000..fb4413f --- /dev/null +++ b/macros.epel @@ -0,0 +1,3 @@ +# epel macros + +%epel %{?rhel}%{!?:rhel:7} From 2dae909ac3a021e5d4db195676da2cf135f9044b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 21 Nov 2014 13:16:00 -0600 Subject: [PATCH 16/31] add systemd 90-epel.preset --- 90-epel.preset | 120 ++++++++++++++++++++++++++++++++++++++++++++++ epel-release.spec | 9 +++- 2 files changed, 128 insertions(+), 1 deletion(-) create mode 100644 90-epel.preset diff --git a/90-epel.preset b/90-epel.preset new file mode 100644 index 0000000..5ee3d5b --- /dev/null +++ b/90-epel.preset @@ -0,0 +1,120 @@ +# Also see: +# https://fedoraproject.org/wiki/Starting_services_by_default + +# On Fedora we deviate from some upstream defaults +disable systemd-timesyncd.service +disable systemd-networkd.service +disable systemd-resolved.service + +# System stuff +enable sshd.service +enable atd.* +enable crond.* +enable chronyd.service +enable rpcbind.* +enable NetworkManager.service +enable NetworkManager-dispatcher.service +enable ModemManager.service +enable auditd.service +enable restorecond.service +enable bluetooth.* +enable avahi-daemon.* +enable cups.* + +# The various syslog implementations +enable rsyslog.* +enable syslog-ng.* +enable sysklogd.* + +# Network facing +enable firewalld.service +enable libvirtd.service +enable xinetd.service +enable ladvd.service + +# Storage +enable multipathd.service +enable libstoragemgmt.service +enable lvm2-monitor.* +enable lvm2-lvmetad.* +enable dm-event.* +enable dmraid-activation.service + +# https://bugzilla.redhat.com/show_bug.cgi?id=855372 +enable mdmonitor.service +enable mdmonitor-takeover.service + +# https://bugzilla.redhat.com/show_bug.cgi?id=876237 +enable spice-vdagentd.service + +# https://bugzilla.redhat.com/show_bug.cgi?id=885406 +enable qemu-guest-agent.service + +# https://bugzilla.redhat.com/show_bug.cgi?id=928726 +enable dnf-makecache.timer + +# https://bugzilla.redhat.com/show_bug.cgi?id=929403 +enable initial-setup-graphical.service +enable initial-setup-text.service + +# https://bugzilla.redhat.com/show_bug.cgi?id=957135 +enable vmtoolsd.service + +# https://bugzilla.redhat.com/show_bug.cgi?id=976315 +enable dkms.service + +# https://bugzilla.redhat.com/show_bug.cgi?id=961878 +enable ipmi.service +enable ipmievd.service + +# https://bugzilla.redhat.com/show_bug.cgi?id=1039351 +enable x509watch.timer + +# https://bugzilla.redhat.com/show_bug.cgi?id=1060754 +enable dnssec-triggerd.service + +# https://bugzilla.redhat.com/show_bug.cgi?id=1095353 +enable uuidd.socket + +# Hardware +enable gpm.* + +# https://bugzilla.redhat.com/show_bug.cgi?id=1066421 +enable gpsd.socket + +# https://bugzilla.redhat.com/show_bug.cgi?id=1141607 +enable x2gocleansessions.service + +enable irqbalance.service +enable lm_sensors.service +enable mcelog.* +enable acpid.* +enable smartd.service +enable pcscd.socket +enable rngd.service + +# Other stuff +enable abrtd.service +enable abrt-ccpp.service +enable abrt-oops.service +enable abrt-xorg.service +enable abrt-vmcore.service +enable lttng-sessiond.service +enable ksm.service +enable ksmtuned.service +enable rootfs-resize.service +enable sysstat.service +enable sysstat-collect.timer +enable sysstat-summary.timer +enable uuidd.service +enable xendomains.service +enable xenstored.service +enable xenconsoled.service + +# Desktop stuff +enable accounts-daemon.service +enable rtkit-daemon.service +enable upower.service +enable udisks2.service +enable polkit.service +enable packagekit-offline-update.service diff --git a/epel-release.spec b/epel-release.spec index b02362f..c0769a7 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 7 -Release: 3 +Release: 4 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -15,6 +15,8 @@ Source1: GPL Source2: epel.repo Source3: epel-testing.repo Source4: macros.epel +# EPEL default preset policy (borrowed from fedora's 90-default.preset) +Source5: 90-epel.preset BuildArch: noarch Requires: redhat-release >= %{version} @@ -43,6 +45,7 @@ install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d install -pm 644 %{SOURCE2} %{SOURCE3} \ $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d install -pm 644 -D %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/rpm/macros.d/macros.epel +install -pm 644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-preset/90-epel.preset %clean rm -rf $RPM_BUILD_ROOT @@ -53,8 +56,12 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) /etc/yum.repos.d/* /etc/pki/rpm-gpg/* /usr/lib/rpm/macros.d/macros.epel +%{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog +* Fri Nov 21 2014 Rex Dieter 7-4 +- add systemd 90-epel.preset + * Fri Nov 21 2014 Rex Dieter 7-3 - implement %%epel macro From 5fb4521c72722b14ab6038f56ee5caf6fb95bb21 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 25 Nov 2014 10:21:26 -0600 Subject: [PATCH 17/31] fix typo in macros.epel --- epel-release.spec | 5 ++++- macros.epel | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/epel-release.spec b/epel-release.spec index c0769a7..3ddcb85 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 7 -Release: 4 +Release: 5 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog +* 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 diff --git a/macros.epel b/macros.epel index fb4413f..105c630 100644 --- a/macros.epel +++ b/macros.epel @@ -1,3 +1,3 @@ # epel macros -%epel %{?rhel}%{!?:rhel:7} +%epel %{?rhel}%{!?rhel:7} From 2d37a8bb8e0cad1d4b36c8474581063dceb30ae6 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Wed, 30 Mar 2016 22:59:46 -0500 Subject: [PATCH 18/31] Remove macros.epel; let epel-rpm-macros handle it. --- epel-release.spec | 9 +++++---- macros.epel | 3 --- 2 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 macros.epel diff --git a/epel-release.spec b/epel-release.spec index 3ddcb85..0c3b095 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 7 -Release: 5 +Release: 6 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -14,7 +14,6 @@ Source0: http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 Source1: GPL Source2: epel.repo Source3: epel-testing.repo -Source4: macros.epel # EPEL default preset policy (borrowed from fedora's 90-default.preset) Source5: 90-epel.preset @@ -44,7 +43,6 @@ install -Dpm 644 %{SOURCE0} \ install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d install -pm 644 %{SOURCE2} %{SOURCE3} \ $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d -install -pm 644 -D %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/rpm/macros.d/macros.epel install -pm 644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-preset/90-epel.preset %clean @@ -59,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog +* 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 @@ -80,5 +81,5 @@ rm -rf $RPM_BUILD_ROOT - Fixes bugs #1052434 and #1093918 * Mon Dec 16 2013 Dennis Gilmore - 7-0.1 -- initial epel 7 build. gpg cheking is disabled +- initial epel 7 build. gpg cheking is disabled diff --git a/macros.epel b/macros.epel deleted file mode 100644 index 105c630..0000000 --- a/macros.epel +++ /dev/null @@ -1,3 +0,0 @@ -# epel macros - -%epel %{?rhel}%{!?rhel:7} From 72566c28fe6191c51faa2f459a97916f4f0eaf88 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Wed, 30 Mar 2016 23:01:22 -0500 Subject: [PATCH 19/31] Renumber sources. --- epel-release.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epel-release.spec b/epel-release.spec index 0c3b095..575f7c4 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -15,7 +15,7 @@ Source1: GPL Source2: epel.repo Source3: epel-testing.repo # EPEL default preset policy (borrowed from fedora's 90-default.preset) -Source5: 90-epel.preset +Source4: 90-epel.preset BuildArch: noarch Requires: redhat-release >= %{version} @@ -43,7 +43,7 @@ install -Dpm 644 %{SOURCE0} \ install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d install -pm 644 %{SOURCE2} %{SOURCE3} \ $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d -install -pm 644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-preset/90-epel.preset +install -pm 644 -D %{SOURCE4} $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-preset/90-epel.preset %clean rm -rf $RPM_BUILD_ROOT From e13a681a1d2f88de2a50d13479e4b01c3858c08d Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Wed, 30 Mar 2016 23:02:17 -0500 Subject: [PATCH 20/31] Also remove the macro file from %files. --- epel-release.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/epel-release.spec b/epel-release.spec index 575f7c4..f2f08d5 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -53,7 +53,6 @@ rm -rf $RPM_BUILD_ROOT %doc GPL %config(noreplace) /etc/yum.repos.d/* /etc/pki/rpm-gpg/* -/usr/lib/rpm/macros.d/macros.epel %{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog From 0fd22cf74135437fcdbcc4ddd8c9f0d9e3425f92 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 3 Jun 2016 07:51:20 -0600 Subject: [PATCH 21/31] Drop initial-setup from presets. Fixes bug #1342511 --- 90-epel.preset | 4 ---- epel-release.spec | 5 ++++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/90-epel.preset b/90-epel.preset index 5ee3d5b..1b75a7c 100644 --- a/90-epel.preset +++ b/90-epel.preset @@ -53,10 +53,6 @@ enable qemu-guest-agent.service # https://bugzilla.redhat.com/show_bug.cgi?id=928726 enable dnf-makecache.timer -# https://bugzilla.redhat.com/show_bug.cgi?id=929403 -enable initial-setup-graphical.service -enable initial-setup-text.service - # https://bugzilla.redhat.com/show_bug.cgi?id=957135 enable vmtoolsd.service diff --git a/epel-release.spec b/epel-release.spec index f2f08d5..743c563 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 7 -Release: 6 +Release: 7 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog +* 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. From 540e474b3a49219a70ddf635ca0d4952085471e0 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 23 Jul 2016 15:36:09 -0600 Subject: [PATCH 22/31] Drop duplicate libstoragemgmt from presets. Fixes bug #1358971 --- 90-epel.preset | 1 - epel-release.spec | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/90-epel.preset b/90-epel.preset index 1b75a7c..91d436d 100644 --- a/90-epel.preset +++ b/90-epel.preset @@ -34,7 +34,6 @@ enable ladvd.service # Storage enable multipathd.service -enable libstoragemgmt.service enable lvm2-monitor.* enable lvm2-lvmetad.* enable dm-event.* diff --git a/epel-release.spec b/epel-release.spec index 743c563..3415478 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 7 -Release: 7 +Release: 8 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog +* 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 From 58d73dc46718eb9f827ce91b9fb257ad7ca56ece Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 27 Dec 2016 10:36:48 -0700 Subject: [PATCH 23/31] Add preset for drbdlinks package. Fixes bug #1405744 --- 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 91d436d..334dfbc 100644 --- a/90-epel.preset +++ b/90-epel.preset @@ -113,3 +113,7 @@ enable upower.service enable udisks2.service enable polkit.service enable packagekit-offline-update.service + +# Support for the DRBD link-cleaning service +# https://bugzilla.redhat.com/show_bug.cgi?id=1405744 +enable drbdlinksclean.service diff --git a/epel-release.spec b/epel-release.spec index 3415478..5f7bc4e 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 7 -Release: 8 +Release: 9 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog +* 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 From ca770c20b4e4024c9e7b9b93de1ff678488925a2 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 24 Jun 2017 09:03:15 -0600 Subject: [PATCH 24/31] Change mirrorlist= in repo files to be metalink= (as thats what they are). Fixes bug #1451212 --- epel-release.spec | 5 ++++- epel-testing.repo | 6 +++--- epel.repo | 6 +++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/epel-release.spec b/epel-release.spec index 5f7bc4e..959df1e 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 7 -Release: 9 +Release: 10 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog +* 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 diff --git a/epel-testing.repo b/epel-testing.repo index 3149d51..94340cc 100644 --- a/epel-testing.repo +++ b/epel-testing.repo @@ -1,7 +1,7 @@ [epel-testing] name=Extra Packages for Enterprise Linux 7 - Testing - $basearch #baseurl=http://download.fedoraproject.org/pub/epel/testing/7/$basearch -mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=testing-epel7&arch=$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel7&arch=$basearch failovermethod=priority enabled=0 gpgcheck=1 @@ -10,7 +10,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 [epel-testing-debuginfo] name=Extra Packages for Enterprise Linux 7 - Testing - $basearch - Debug #baseurl=http://download.fedoraproject.org/pub/epel/testing/7/$basearch/debug -mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel7&arch=$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel7&arch=$basearch failovermethod=priority enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 @@ -19,7 +19,7 @@ gpgcheck=1 [epel-testing-source] name=Extra Packages for Enterprise Linux 7 - Testing - $basearch - Source #baseurl=http://download.fedoraproject.org/pub/epel/testing/7/SRPMS -mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel7&arch=$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel7&arch=$basearch failovermethod=priority enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 diff --git a/epel.repo b/epel.repo index c3a643e..9096443 100644 --- a/epel.repo +++ b/epel.repo @@ -1,7 +1,7 @@ [epel] name=Extra Packages for Enterprise Linux 7 - $basearch #baseurl=http://download.fedoraproject.org/pub/epel/7/$basearch -mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch failovermethod=priority enabled=1 gpgcheck=1 @@ -10,7 +10,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 [epel-debuginfo] name=Extra Packages for Enterprise Linux 7 - $basearch - Debug #baseurl=http://download.fedoraproject.org/pub/epel/7/$basearch/debug -mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-7&arch=$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-7&arch=$basearch failovermethod=priority enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 @@ -19,7 +19,7 @@ gpgcheck=1 [epel-source] name=Extra Packages for Enterprise Linux 7 - $basearch - Source #baseurl=http://download.fedoraproject.org/pub/epel/7/SRPMS -mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-source-7&arch=$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-7&arch=$basearch failovermethod=priority enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 From 595b05d36ed5cb594aed5b6f74ce7945a1660327 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 2 Oct 2017 10:43:20 -0700 Subject: [PATCH 25/31] Add Conflicts on fedora-release to prevent people from installing on Fedora systems. Fixes bug #1497702 --- epel-release.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/epel-release.spec b/epel-release.spec index 959df1e..cd5fa1f 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 7 -Release: 10 +Release: 11 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -19,6 +19,8 @@ Source4: 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 @@ -56,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog +* 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 From a3db78fa0fd57aa567c45380dde79c1cf6c5866f Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Tue, 17 Sep 2019 23:24:36 +0000 Subject: [PATCH 26/31] Add in &infra and content variables to better understand users of EPEL. --- epel-release.spec | 5 ++++- epel-testing.repo | 6 +++--- epel.repo | 6 +++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/epel-release.spec b/epel-release.spec index cd5fa1f..f9c8cc2 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 7 -Release: 11 +Release: 12 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog +* Mon Sep 16 2019 Stephen Smoogen - 7-12 +- Add in &infra and content variables to better understand users of EPEL. + * Mon Oct 02 2017 Kevin Fenzi - 7-11 - Add Conflicts on fedora-release to prevent people from installing on Fedora systems. Fixes bug #1497702 diff --git a/epel-testing.repo b/epel-testing.repo index 94340cc..622a12f 100644 --- a/epel-testing.repo +++ b/epel-testing.repo @@ -1,7 +1,7 @@ [epel-testing] name=Extra Packages for Enterprise Linux 7 - Testing - $basearch #baseurl=http://download.fedoraproject.org/pub/epel/testing/7/$basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel7&arch=$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel7&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-7 [epel-testing-debuginfo] name=Extra Packages for Enterprise Linux 7 - Testing - $basearch - Debug #baseurl=http://download.fedoraproject.org/pub/epel/testing/7/$basearch/debug -metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel7&arch=$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel7&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 @@ -19,7 +19,7 @@ gpgcheck=1 [epel-testing-source] name=Extra Packages for Enterprise Linux 7 - Testing - $basearch - Source #baseurl=http://download.fedoraproject.org/pub/epel/testing/7/SRPMS -metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel7&arch=$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel7&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 diff --git a/epel.repo b/epel.repo index 9096443..219c871 100644 --- a/epel.repo +++ b/epel.repo @@ -1,7 +1,7 @@ [epel] name=Extra Packages for Enterprise Linux 7 - $basearch #baseurl=http://download.fedoraproject.org/pub/epel/7/$basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=1 gpgcheck=1 @@ -10,7 +10,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 [epel-debuginfo] name=Extra Packages for Enterprise Linux 7 - $basearch - Debug #baseurl=http://download.fedoraproject.org/pub/epel/7/$basearch/debug -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-7&arch=$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-7&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 @@ -19,7 +19,7 @@ gpgcheck=1 [epel-source] name=Extra Packages for Enterprise Linux 7 - $basearch - Source #baseurl=http://download.fedoraproject.org/pub/epel/7/SRPMS -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-7&arch=$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-7&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 From 6ed789f317bd41cf48eb68bfb3ad832a1b74ad71 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 31 Oct 2020 13:32:49 -0700 Subject: [PATCH 27/31] Add preset for x2gocleansessions. Fixes bug #1141609 --- 90-epel.preset | 3 +++ epel-release.spec | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/90-epel.preset b/90-epel.preset index 334dfbc..7abf5f3 100644 --- a/90-epel.preset +++ b/90-epel.preset @@ -65,6 +65,9 @@ enable ipmievd.service # https://bugzilla.redhat.com/show_bug.cgi?id=1039351 enable x509watch.timer +# https://bugzilla.redhat.com/show_bug.cgi?id=1141609 +enable x2gocleansessions + # https://bugzilla.redhat.com/show_bug.cgi?id=1060754 enable dnssec-triggerd.service diff --git a/epel-release.spec b/epel-release.spec index f9c8cc2..1fab2e9 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 7 -Release: 12 +Release: 13 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog +* Sat Oct 31 2020 Kevin Fenzi - 7-13 +- Add preset for x2gocleansessions. Fixes bug #1141609 + * Mon Sep 16 2019 Stephen Smoogen - 7-12 - Add in &infra and content variables to better understand users of EPEL. From cd93f650adff20c4152a2e5ecd2f6cdb6cfdc79f Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Mon, 10 Feb 2020 18:19:28 +0100 Subject: [PATCH 28/31] Remove baseurl download.fp.o We want to discourage people from using download.fedoraproject.org, so hopefully we get less people to use it for package downloads by not "advertising" it as an option in the repo files. It is vastly suboptimal to using metalink for all parties involved. Signed-off-by: Patrick Uiterwijk --- epel-testing.repo | 3 --- epel.repo | 3 --- 2 files changed, 6 deletions(-) diff --git a/epel-testing.repo b/epel-testing.repo index 622a12f..f64a7c7 100644 --- a/epel-testing.repo +++ b/epel-testing.repo @@ -1,6 +1,5 @@ [epel-testing] name=Extra Packages for Enterprise Linux 7 - Testing - $basearch -#baseurl=http://download.fedoraproject.org/pub/epel/testing/7/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel7&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 @@ -9,7 +8,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 [epel-testing-debuginfo] name=Extra Packages for Enterprise Linux 7 - Testing - $basearch - Debug -#baseurl=http://download.fedoraproject.org/pub/epel/testing/7/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel7&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 @@ -18,7 +16,6 @@ gpgcheck=1 [epel-testing-source] name=Extra Packages for Enterprise Linux 7 - Testing - $basearch - Source -#baseurl=http://download.fedoraproject.org/pub/epel/testing/7/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel7&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 diff --git a/epel.repo b/epel.repo index 219c871..8f396f2 100644 --- a/epel.repo +++ b/epel.repo @@ -1,6 +1,5 @@ [epel] name=Extra Packages for Enterprise Linux 7 - $basearch -#baseurl=http://download.fedoraproject.org/pub/epel/7/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=1 @@ -9,7 +8,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 [epel-debuginfo] name=Extra Packages for Enterprise Linux 7 - $basearch - Debug -#baseurl=http://download.fedoraproject.org/pub/epel/7/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-7&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 @@ -18,7 +16,6 @@ gpgcheck=1 [epel-source] name=Extra Packages for Enterprise Linux 7 - $basearch - Source -#baseurl=http://download.fedoraproject.org/pub/epel/7/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-7&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 From a33ba39561f43b62d9a97d4beca891f97ca012b2 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 1 May 2021 15:46:33 -0700 Subject: [PATCH 29/31] Add back commented out baseurls, make them a invalid address and add a note Metalinks are vastly preferred over baseurls for security sake. download.fedoraproject.org works via a mirrormanager redirect, but is also not a great baseurl (it gives you any mirror, may not have your content, might give you http links, etc). Some folks might use sed to change this, so give them something to sed. Signed-off-by: Kevin Fenzi --- epel-testing.repo | 9 +++++++++ epel.repo | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/epel-testing.repo b/epel-testing.repo index f64a7c7..40ee441 100644 --- a/epel-testing.repo +++ b/epel-testing.repo @@ -1,5 +1,8 @@ [epel-testing] name=Extra Packages for Enterprise Linux 7 - 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=http://download.example/pub/epel/testing/7/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel7&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 @@ -8,6 +11,9 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 [epel-testing-debuginfo] name=Extra Packages for Enterprise Linux 7 - 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=http://download.example/pub/epel/testing/7/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel7&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 @@ -16,6 +22,9 @@ gpgcheck=1 [epel-testing-source] name=Extra Packages for Enterprise Linux 7 - 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=http://download.example/pub/epel/testing/7/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel7&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 diff --git a/epel.repo b/epel.repo index 8f396f2..9a14cb7 100644 --- a/epel.repo +++ b/epel.repo @@ -1,5 +1,8 @@ [epel] name=Extra Packages for Enterprise Linux 7 - $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=http://download.example/pub/epel/7/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=1 @@ -8,6 +11,9 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 [epel-debuginfo] name=Extra Packages for Enterprise Linux 7 - $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=http://download.example/pub/epel/7/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-7&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 @@ -16,6 +22,9 @@ gpgcheck=1 [epel-source] name=Extra Packages for Enterprise Linux 7 - $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=http://download.example/pub/epel/7/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-7&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 From 78a405dedf58dccf60f7807e1a311bc99bb9d35e Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Mon, 12 Jul 2021 20:03:49 -0500 Subject: [PATCH 30/31] Fixes spelling error Signed-off-by: Maxwell G --- epel-testing.repo | 6 +++--- epel.repo | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epel-testing.repo b/epel-testing.repo index 40ee441..ebf612d 100644 --- a/epel-testing.repo +++ b/epel-testing.repo @@ -1,7 +1,7 @@ [epel-testing] name=Extra Packages for Enterprise Linux 7 - 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=http://download.example/pub/epel/testing/7/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel7&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority @@ -12,7 +12,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 [epel-testing-debuginfo] name=Extra Packages for Enterprise Linux 7 - 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=http://download.example/pub/epel/testing/7/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel7&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority @@ -23,7 +23,7 @@ gpgcheck=1 [epel-testing-source] name=Extra Packages for Enterprise Linux 7 - 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=http://download.example/pub/epel/testing/7/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel7&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority diff --git a/epel.repo b/epel.repo index 9a14cb7..2cff646 100644 --- a/epel.repo +++ b/epel.repo @@ -1,7 +1,7 @@ [epel] name=Extra Packages for Enterprise Linux 7 - $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=http://download.example/pub/epel/7/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority @@ -12,7 +12,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 [epel-debuginfo] name=Extra Packages for Enterprise Linux 7 - $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=http://download.example/pub/epel/7/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-7&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority @@ -23,7 +23,7 @@ gpgcheck=1 [epel-source] name=Extra Packages for Enterprise Linux 7 - $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=http://download.example/pub/epel/7/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-7&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority From 4ca5166d5b7c82f949721255eb005f07c5aa7e90 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 1 Jul 2021 09:41:26 -0400 Subject: [PATCH 31/31] Change the baseurl to point to source/tree for srpms Signed-off-by: Mohan Boddu --- epel-release.spec | 5 ++++- epel-testing.repo | 4 ++-- epel.repo | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/epel-release.spec b/epel-release.spec index 1fab2e9..58de202 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 7 -Release: 13 +Release: 14 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog +* Thu Jul 01 2021 Mohan Boddu - 7-14 +- Change the baseurl to point to source/tree for srpms + * Sat Oct 31 2020 Kevin Fenzi - 7-13 - Add preset for x2gocleansessions. Fixes bug #1141609 diff --git a/epel-testing.repo b/epel-testing.repo index ebf612d..cf0f2a7 100644 --- a/epel-testing.repo +++ b/epel-testing.repo @@ -23,8 +23,8 @@ gpgcheck=1 [epel-testing-source] name=Extra Packages for Enterprise Linux 7 - 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=http://download.example/pub/epel/testing/7/SRPMS +# place it's address here. +#baseurl=http://download.example/pub/epel/testing/7/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel7&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 diff --git a/epel.repo b/epel.repo index 2cff646..5739342 100644 --- a/epel.repo +++ b/epel.repo @@ -23,8 +23,8 @@ gpgcheck=1 [epel-source] name=Extra Packages for Enterprise Linux 7 - $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=http://download.example/pub/epel/7/SRPMS +# place it's address here. +#baseurl=http://download.example/pub/epel/7/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-7&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0