projects/ssl-cert-check/rhn-ssl-cert-check | 10 +--------- projects/ssl-cert-check/spacewalk-ssl-cert-check.spec | 11 +++++++---- rel-eng/packages/spacewalk-ssl-cert-check | 2 +- 3 files changed, 9 insertions(+), 14 deletions(-)
New commits: commit f11482458f713ed857b6640202f9770c4a0830e0 Author: Miroslav Suchý msuchy@redhat.com Date: Thu Sep 24 10:46:46 2009 +0200
Automatic commit of package [spacewalk-ssl-cert-check] release [1.9-1].
diff --git a/projects/ssl-cert-check/spacewalk-ssl-cert-check.spec b/projects/ssl-cert-check/spacewalk-ssl-cert-check.spec index cb6130f..d2f2213 100644 --- a/projects/ssl-cert-check/spacewalk-ssl-cert-check.spec +++ b/projects/ssl-cert-check/spacewalk-ssl-cert-check.spec @@ -5,7 +5,7 @@ License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... Epoch: 1 -Version: 1.8 +Version: 1.9 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -42,8 +42,10 @@ rm -rf $RPM_BUILD_ROOT %attr(0755,root,root) %{_datadir}/ssl/ssl-cert-check %doc LICENSE
-# $Id: ssl-cert-check.spec,v 1.1 2005/05/09 17:58:28 alikins Exp $ %changelog +* Thu Sep 24 2009 Miroslav Suchý msuchy@redhat.com 1.9-1 +- 524053 - Force to "upgrade" to older version of rhn-ssl-cert-check + * Fri Aug 28 2009 Michael Mraka michael.mraka@redhat.com 1.8-1 - grep | awk is rarely needed - use spacewalk-cfg-get instead of awk diff --git a/rel-eng/packages/spacewalk-ssl-cert-check b/rel-eng/packages/spacewalk-ssl-cert-check index cbbeb53..aec6b0b 100644 --- a/rel-eng/packages/spacewalk-ssl-cert-check +++ b/rel-eng/packages/spacewalk-ssl-cert-check @@ -1 +1 @@ -1.8-1 projects/ssl-cert-check/ +1.9-1 projects/ssl-cert-check/
commit f542d9b09d08692411f06304d45601e5bcd9d060 Author: Miroslav Suchý msuchy@redhat.com Date: Thu Sep 24 10:44:05 2009 +0200
Revert "524053 - For older satellites and older proxies we should check for old paths"
This reverts commit cb06ade083277d7e68112ed3bc77c3adc23188fd.
diff --git a/projects/ssl-cert-check/rhn-ssl-cert-check b/projects/ssl-cert-check/rhn-ssl-cert-check index 98c3afd..ce59b9f 100644 --- a/projects/ssl-cert-check/rhn-ssl-cert-check +++ b/projects/ssl-cert-check/rhn-ssl-cert-check @@ -32,15 +32,7 @@ unset ADMIN EXPIRATION CHECK EXPIRATION=${EXPIRATION:-60}
RHN_CONF_FILE=/etc/rhn/rhn.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_HTTPD_CONF_FILE=/etc/httpd/conf.d/ssl.conf SSL_CERT_CHECK=/usr/share/ssl/ssl-cert-check REMOTE_HOSTS=/etc/sysconfig/rhn/ssl-hosts.conf
commit 4b773545f3515fd3b599eeaf2a69962511e580e7 Author: Miroslav Suchý msuchy@redhat.com Date: Thu Sep 24 10:26:50 2009 +0200
524053 - Force to "upgrade" to older version of rhn-ssl-cert-check
diff --git a/projects/ssl-cert-check/spacewalk-ssl-cert-check.spec b/projects/ssl-cert-check/spacewalk-ssl-cert-check.spec index aec519b..cb6130f 100644 --- a/projects/ssl-cert-check/spacewalk-ssl-cert-check.spec +++ b/projects/ssl-cert-check/spacewalk-ssl-cert-check.spec @@ -4,13 +4,14 @@ Group: Applications/System License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... +Epoch: 1 Version: 1.8 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: openssl -Obsoletes: rhn-ssl-cert-check < %{version} -Provides: rhn-ssl-cert-check = %{version} +Obsoletes: rhn-ssl-cert-check < %{epoch}:%{version} +Provides: rhn-ssl-cert-check = %{epoch}:%{version}
%description Runs a check once a day to see if the ssl certificates installed on this
spacewalk-commits@lists.fedorahosted.org