client/rhel/rhnsd/LICENSE | 339 +++++++++++++++++++++++++++++ client/rhel/rhnsd/rhnsd.c | 2 client/rhel/rhnsd/rhnsd.spec | 17 + projects/ssl-cert-check/rhn-ssl-cert-check | 10 rel-eng/Makefile.srpm | 20 - rel-eng/packages/rhnsd | 2 6 files changed, 372 insertions(+), 18 deletions(-)
New commits: commit b1d093521f4fbcb0f771dde7c6e05696534ebde6 Author: Miroslav Suchý msuchy@redhat.com Date: Tue Sep 22 15:35:44 2009 +0200
Automatic commit of package [rhnsd] release [4.5.13-1].
diff --git a/client/rhel/rhnsd/rhnsd.spec b/client/rhel/rhnsd/rhnsd.spec index 83607fd..1e84b89 100644 --- a/client/rhel/rhnsd/rhnsd.spec +++ b/client/rhel/rhnsd/rhnsd.spec @@ -4,7 +4,7 @@ Group: System Environment/Base Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... URL: https://fedorahosted.org/spacewalk Name: rhnsd -Version: 4.5.12 +Version: 4.5.13 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -63,6 +63,12 @@ rm -fr $RPM_BUILD_ROOT %doc LICENSE
%changelog +* Tue Sep 22 2009 Miroslav Suchý msuchy@redhat.com 4.5.13-1 +- use macros +- pass CFLAGS on correct position +- add LICENSE file +- change header info to actual license + * Mon Sep 21 2009 Miroslav Suchý msuchy@redhat.com 4.5.12-1 - implement try-restart as alias for condrestart - add LSB header diff --git a/rel-eng/packages/rhnsd b/rel-eng/packages/rhnsd index 27ed7b7..bb71d42 100644 --- a/rel-eng/packages/rhnsd +++ b/rel-eng/packages/rhnsd @@ -1 +1 @@ -4.5.12-1 client/rhel/rhnsd/ +4.5.13-1 client/rhel/rhnsd/
commit 952c08419ae95f554489e6850b2d8b4f09ee8534 Author: Miroslav Suchý msuchy@redhat.com Date: Tue Sep 22 15:32:36 2009 +0200
524558 - pass CFLAGS on correct position
diff --git a/client/rhel/rhnsd/rhnsd.spec b/client/rhel/rhnsd/rhnsd.spec index 87f44fe..83607fd 100644 --- a/client/rhel/rhnsd/rhnsd.spec +++ b/client/rhel/rhnsd/rhnsd.spec @@ -26,11 +26,11 @@ your machine, and runs any actions. %setup -q
%build -make -f Makefile.rhnsd +make -f Makefile.rhnsd %{?_smp_mflags} CFLAGS="%{optflags}"
%install rm -rf $RPM_BUILD_ROOT -make -f Makefile.rhnsd install VERSION=%{version}-%{release} PREFIX=$RPM_BUILD_ROOT MANPATH=%{_mandir} %{?_smp_mflags} CXXFLAGS="%{optflags}" +make -f Makefile.rhnsd install VERSION=%{version}-%{release} PREFIX=$RPM_BUILD_ROOT MANPATH=%{_mandir}
%find_lang %{name}
commit cbaed881b9d9e112e8aeba2099db4c32d7a9e89f Author: Miroslav Suchý msuchy@redhat.com Date: Tue Sep 22 15:26:59 2009 +0200
workaround for bz 524844
debugedit do not like /foo//BUILD path
diff --git a/rel-eng/Makefile.srpm b/rel-eng/Makefile.srpm index 62b6ef9..e1d16ff 100644 --- a/rel-eng/Makefile.srpm +++ b/rel-eng/Makefile.srpm @@ -26,7 +26,7 @@ COMMIT_TIMESTAMP = $(shell git rev-list --timestamp --max-count=1 $(COMMIT_SHA1) ifndef DIR DIR := $(shell git show $(COMMIT_SHA1):rel-eng/packages/$(NAME) 2> /dev/null | awk '{print $$2; exit }') endif -RPMBUILD_DIR := $(RPMBUILD_BASEDIR)/rpmbuild-$(NAME)-git-$(COMMIT_SHA1)/ +RPMBUILD_DIR := $(RPMBUILD_BASEDIR)/rpmbuild-$(NAME)-git-$(COMMIT_SHA1) endif
# The TAG parameter determines git tag, and by stripping @@ -65,11 +65,11 @@ NAME_VERSION := $(shell echo $(TAG)| sed 's!-[^-]*$$!!') NAME_TAR_GZ_DIR := $(shell echo $(TAG)| sed 's!-[^-]*$$!!') COMMIT_TIMESTAMP = $(shell git rev-list --timestamp --max-count=1 $(COMMIT_SHA1) | awk '{print $$1}') DIR := $(shell git show $(COMMIT_SHA1):rel-eng/packages/$(NAME) | awk '{print $$2; exit }') -RPMBUILD_DIR := $(RPMBUILD_BASEDIR)/rpmbuild-$(TAG)/ +RPMBUILD_DIR := $(RPMBUILD_BASEDIR)/rpmbuild-$(TAG) endif endif
-RPMBUILD_SOURCEDIR := $(RPMBUILD_DIR)SOURCES/$(DIR) +RPMBUILD_SOURCEDIR := $(RPMBUILD_DIR)/SOURCES/$(DIR) NAME_TAR_GZ := $(NAME_TAR_GZ_DIR).tar.gz
ifdef DIST @@ -88,7 +88,7 @@ DIR_OR_PREFIX := $(GIT_PREFIX) endif
tgz : git-archive-to-tar-gz - @echo "Wrote: $(RPMBUILD_DIR)$(NAME_TAR_GZ)" + @echo "Wrote: $(RPMBUILD_DIR)/$(NAME_TAR_GZ)"
git-archive-unpack : git-archive-to-tar-gz unpack-tar-gz
@@ -124,10 +124,10 @@ git-archive-to-tar-gz : setup-source-dir @cd $(GIT_CDUP) && \ git archive --format=tar --prefix=$(NAME_TAR_GZ_DIR)/ $(COMMIT_SHA1):$(DIR) \ | perl $(THIS_DIR)tar-fixup-stamp-comment.pl $(COMMIT_TIMESTAMP) $(COMMIT_SHA1) \ - | gzip -n -c - > $(RPMBUILD_DIR)$(NAME_TAR_GZ) + | gzip -n -c - > $(RPMBUILD_DIR)/$(NAME_TAR_GZ)
unpack-tar-gz : setup-source-dir-2 - @cd $(RPMBUILD_SOURCEDIR) && tar xz --strip-components 1 -f $(RPMBUILD_DIR)$(NAME_TAR_GZ) + @cd $(RPMBUILD_SOURCEDIR) && tar xz --strip-components 1 -f $(RPMBUILD_DIR)/$(NAME_TAR_GZ)
setup-source-dir : @@ -140,7 +140,7 @@ setup-source-dir :
setup-source-dir-2 : @mkdir -p $(RPMBUILD_SOURCEDIR) - @ln -s $(THIS_DIR) $(RPMBUILD_DIR)SOURCES/rel-eng + @ln -s $(THIS_DIR) $(RPMBUILD_DIR)/SOURCES/rel-eng
rpmbuild_x-build-srpm_params = --nodeps -bs @@ -166,13 +166,13 @@ x-setup-specfile :
x-pull-in-tar-gz : @if test -z "$(NO_TAR_GZ)" ; then \ - for i in $(X_RPMBUILD_DIR)*.tar.gz ; do \ + for i in $(X_RPMBUILD_DIR)/*.tar.gz ; do \ NAME_TAR_GZ=`basename $$i` ; \ if test -e $$NAME_TAR_GZ ; then \ echo "The tarball seems to contain $$NAME_TAR_GZ already." ; \ exit 1 ; \ fi ; \ - mv $(X_RPMBUILD_DIR)*.tar.gz . ; \ + mv $(X_RPMBUILD_DIR)/*.tar.gz . ; \ done ; \ fi
@@ -184,7 +184,7 @@ x-download-source0 : fi
upload-tgz : tgz - @scp $(RPMBUILD_DIR)$(NAME_TAR_GZ) fedorahosted.org:spacewalk + @scp $(RPMBUILD_DIR)/$(NAME_TAR_GZ) fedorahosted.org:spacewalk
%.src.rpm %.srpm : $(MAKE) --no-print-directory srpm TAG=$*
commit e36c1600a4656393cc33234603f45c01eed12fc9 Author: Miroslav Suchý msuchy@redhat.com Date: Mon Sep 21 15:27:59 2009 +0200
524558 - use macros
diff --git a/client/rhel/rhnsd/rhnsd.spec b/client/rhel/rhnsd/rhnsd.spec index cc9ff6f..87f44fe 100644 --- a/client/rhel/rhnsd/rhnsd.spec +++ b/client/rhel/rhnsd/rhnsd.spec @@ -56,9 +56,9 @@ rm -fr $RPM_BUILD_ROOT
%files -f %{name}.lang %defattr(-,root,root) -%config(noreplace) /etc/sysconfig/rhn/rhnsd -/usr/sbin/rhnsd -/etc/rc.d/init.d/rhnsd +%config(noreplace) %{_sysconfdir}/sysconfig/rhn/rhnsd +%{_sbindir}/rhnsd +%{_initrddir}/rhnsd %{_mandir}/man8/rhnsd.8* %doc LICENSE
commit 29eebe3a6935a4f508c7c6bb97fa79bfff7be784 Author: Miroslav Suchý msuchy@redhat.com Date: Mon Sep 21 15:21:01 2009 +0200
524558 - add LICENSE file
diff --git a/client/rhel/rhnsd/LICENSE b/client/rhel/rhnsd/LICENSE new file mode 100644 index 0000000..d511905 --- /dev/null +++ b/client/rhel/rhnsd/LICENSE @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + 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 Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +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 + + 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. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +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. + + <signature of Ty Coon>, 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 Lesser General +Public License instead of this License. diff --git a/client/rhel/rhnsd/rhnsd.spec b/client/rhel/rhnsd/rhnsd.spec index a733d5c..cc9ff6f 100644 --- a/client/rhel/rhnsd/rhnsd.spec +++ b/client/rhel/rhnsd/rhnsd.spec @@ -60,6 +60,7 @@ rm -fr $RPM_BUILD_ROOT /usr/sbin/rhnsd /etc/rc.d/init.d/rhnsd %{_mandir}/man8/rhnsd.8* +%doc LICENSE
%changelog * Mon Sep 21 2009 Miroslav Suchý msuchy@redhat.com 4.5.12-1
commit 58aba0153bfc79f43c869c2c23e3237b9edd77fa Author: Miroslav Suchý msuchy@redhat.com Date: Mon Sep 21 15:18:59 2009 +0200
524558 - change header info to actual license
diff --git a/client/rhel/rhnsd/rhnsd.c b/client/rhel/rhnsd/rhnsd.c index 29bde69..ca5c1ae 100644 --- a/client/rhel/rhnsd/rhnsd.c +++ b/client/rhel/rhnsd/rhnsd.c @@ -4,7 +4,7 @@ * Author: * Cristian Gafton gafton@redhat.com * - * Distributed under GPL + * Distributed under GPLv2 * $Id$ */
commit 59cb804adcdda952dbcb9eb36bc7d4b607d1e7b8 Author: Miroslav Suchý msuchy@redhat.com Date: Mon Sep 21 15:17:08 2009 +0200
524558 - honor the applicable compiler flags set in the system rpm configuration
diff --git a/client/rhel/rhnsd/rhnsd.spec b/client/rhel/rhnsd/rhnsd.spec index e1a88f7..a733d5c 100644 --- a/client/rhel/rhnsd/rhnsd.spec +++ b/client/rhel/rhnsd/rhnsd.spec @@ -30,7 +30,7 @@ make -f Makefile.rhnsd
%install rm -rf $RPM_BUILD_ROOT -make -f Makefile.rhnsd install VERSION=%{version}-%{release} PREFIX=$RPM_BUILD_ROOT MANPATH=%{_mandir} +make -f Makefile.rhnsd install VERSION=%{version}-%{release} PREFIX=$RPM_BUILD_ROOT MANPATH=%{_mandir} %{?_smp_mflags} CXXFLAGS="%{optflags}"
%find_lang %{name}
commit cb06ade083277d7e68112ed3bc77c3adc23188fd Author: Miroslav Suchý msuchy@redhat.com Date: Mon Sep 21 14:53:51 2009 +0200
524053 - For older satellites and older proxies we should check for old paths
diff --git a/projects/ssl-cert-check/rhn-ssl-cert-check b/projects/ssl-cert-check/rhn-ssl-cert-check index ce59b9f..98c3afd 100644 --- a/projects/ssl-cert-check/rhn-ssl-cert-check +++ b/projects/ssl-cert-check/rhn-ssl-cert-check @@ -32,7 +32,15 @@ unset ADMIN EXPIRATION CHECK EXPIRATION=${EXPIRATION:-60}
RHN_CONF_FILE=/etc/rhn/rhn.conf -SSL_HTTPD_CONF_FILE=/etc/httpd/conf.d/ssl.conf +if rpm -q rhns-proxy-management; then + # for proxy 5.2 and older + SSL_HTTPD_CONF_FILE=/etc/httpd/conf.d/ssl.conf +elif rpm -q rhn-satellite-config + # for satellite 5.2 and older + SSL_HTTPD_CONF_FILE=/etc/rhn/satellite-httpd/conf/ssl.conf +else + SSL_HTTPD_CONF_FILE=/etc/httpd/conf.d/ssl.conf +fi >/dev/null SSL_CERT_CHECK=/usr/share/ssl/ssl-cert-check REMOTE_HOSTS=/etc/sysconfig/rhn/ssl-hosts.conf