rel-eng/packages/spacewalk-certs-tools | 2 +-
spacewalk/certs-tools/rhn_bootstrap_strings.py | 4 ++--
spacewalk/certs-tools/spacewalk-certs-tools.spec | 5 ++++-
3 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit ea9e18f9748c1849b5559e125fd4b369f7be50b2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 31 09:31:57 2012 +0100
Automatic commit of package [spacewalk-certs-tools] release [1.8.4-1].
diff --git a/rel-eng/packages/spacewalk-certs-tools
b/rel-eng/packages/spacewalk-certs-tools
index 193a009..cfcf83e 100644
--- a/rel-eng/packages/spacewalk-certs-tools
+++ b/rel-eng/packages/spacewalk-certs-tools
@@ -1 +1 @@
-1.8.3-1 spacewalk/certs-tools/
+1.8.4-1 spacewalk/certs-tools/
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec
b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index 9682451..6da6390 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -2,7 +2,7 @@ Name: spacewalk-certs-tools
Summary: Spacewalk SSL Key/Cert Tool
Group: Applications/Internet
License: GPLv2
-Version: 1.8.3
+Version: 1.8.4
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
%{_var}/www/html/pub/bootstrap/client_config_update.py*
%changelog
+* Wed Oct 31 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.4-1
+- download CA cert via http
+
* Tue Oct 30 2012 Jan Pazdziora 1.8.3-1
- Update the copyright year.
commit ba3433047a3760b753e76982d427d46fbaf8b5bf
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 31 09:25:43 2012 +0100
download CA cert via http
fixing chicken-or-egg problem when download of CA cert fails because
server cert can't be validated without CA cert
diff --git a/spacewalk/certs-tools/rhn_bootstrap_strings.py
b/spacewalk/certs-tools/rhn_bootstrap_strings.py
index 5e443fc..3321e0b 100644
--- a/spacewalk/certs-tools/rhn_bootstrap_strings.py
+++ b/spacewalk/certs-tools/rhn_bootstrap_strings.py
@@ -258,10 +258,10 @@ def getCorpCACertSh():
echo
echo "* attempting to install corporate public CA cert"
if [ $ORG_CA_CERT_IS_RPM_YN -eq 1 ] ; then
- rpm -Uvh --force --replacefiles --replacepkgs ${HTTPS_PUB_DIRECTORY}/${ORG_CA_CERT}
+ rpm -Uvh --force --replacefiles --replacepkgs ${HTTP_PUB_DIRECTORY}/${ORG_CA_CERT}
else
rm -f ${ORG_CA_CERT}
- $FETCH ${HTTPS_PUB_DIRECTORY}/${ORG_CA_CERT}
+ $FETCH ${HTTP_PUB_DIRECTORY}/${ORG_CA_CERT}
mv ${ORG_CA_CERT} /usr/share/rhn/
fi