2 commits - proxy/proxy rel-eng/packages
by StephenHerr
proxy/proxy/broker/rhnBroker.py | 4 ++--
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit a39937a9fc2bc558014f1c46897fd397101ff69a
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri Aug 23 16:24:16 2013 -0400
Automatic commit of package [spacewalk-proxy] release [2.1.5-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index 66884e4..3fb3427 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -4,7 +4,7 @@ Group: Applications/Internet
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 2.1.4
+Version: 2.1.5
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -330,6 +330,9 @@ fi
%changelog
+* Fri Aug 23 2013 Stephen Herr <sherr(a)redhat.com> 2.1.5-1
+- 1000586 - pylint errors
+
* Fri Aug 23 2013 Stephen Herr <sherr(a)redhat.com> 2.1.4-1
- 1000586 - fix checkstyle errors
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index d95690e..5c6d418 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-2.1.4-1 proxy/proxy/
+2.1.5-1 proxy/proxy/
commit e3b3bf74c9cee069c75231ddfd9f9f27cb2a7858
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri Aug 23 16:24:10 2013 -0400
1000586 - pylint errors
diff --git a/proxy/proxy/broker/rhnBroker.py b/proxy/proxy/broker/rhnBroker.py
index 507ec8e..7477252 100644
--- a/proxy/proxy/broker/rhnBroker.py
+++ b/proxy/proxy/broker/rhnBroker.py
@@ -76,7 +76,7 @@ class BrokerHandler(SharedHandler):
# entry on the client or the hostname of some other
# machine (say a load balancer)) then use it
hostname = req.headers_in['Host']
- except Exception:
+ except (socket.gaierror, socket.error, socket.herror, socket.timeout):
# hostname probably didn't exist, fine
pass
if not hostname:
@@ -84,7 +84,7 @@ class BrokerHandler(SharedHandler):
# ip address
try:
hostname = socket.gethostbyaddr(my_ip_addr)[0]
- except Exception:
+ except (socket.gaierror, socket.error, socket.herror, socket.timeout):
# unknown host, we don't have a hostname?
pass
if not hostname:
10 years, 9 months
Changes to 'refs/tags/spacewalk-proxy-2.1.4-1'
by StephenHerr
Tag 'spacewalk-proxy-2.1.4-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-08-23 19:53 +0000
Tagging package [spacewalk-proxy] version [2.1.4-1] in directory [proxy/proxy/].
Changes since spacewalk-proxy-2.1.3-1:
Stephen Herr (2):
1000586 - fix checkstyle errors
Automatic commit of package [spacewalk-proxy] release [2.1.4-1].
---
proxy/proxy/broker/rhnBroker.py | 4 ++--
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
---
10 years, 9 months
2 commits - proxy/proxy rel-eng/packages
by StephenHerr
proxy/proxy/broker/rhnBroker.py | 4 ++--
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 06c772ad60ecf3333cd5703097e77c4d9143fc40
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri Aug 23 15:53:06 2013 -0400
Automatic commit of package [spacewalk-proxy] release [2.1.4-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index e4429cd..66884e4 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -4,7 +4,7 @@ Group: Applications/Internet
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 2.1.3
+Version: 2.1.4
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -330,6 +330,9 @@ fi
%changelog
+* Fri Aug 23 2013 Stephen Herr <sherr(a)redhat.com> 2.1.4-1
+- 1000586 - fix checkstyle errors
+
* Fri Aug 23 2013 Stephen Herr <sherr(a)redhat.com> 2.1.3-1
- 1000586 - /etc/hosts doesn't work with proxies
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index 7f8b17b..d95690e 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-2.1.3-1 proxy/proxy/
+2.1.4-1 proxy/proxy/
commit 683e4debba61b41caadd54cd78d7164b65984f8c
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri Aug 23 15:52:58 2013 -0400
1000586 - fix checkstyle errors
diff --git a/proxy/proxy/broker/rhnBroker.py b/proxy/proxy/broker/rhnBroker.py
index 38ba721..507ec8e 100644
--- a/proxy/proxy/broker/rhnBroker.py
+++ b/proxy/proxy/broker/rhnBroker.py
@@ -76,7 +76,7 @@ class BrokerHandler(SharedHandler):
# entry on the client or the hostname of some other
# machine (say a load balancer)) then use it
hostname = req.headers_in['Host']
- except:
+ except Exception:
# hostname probably didn't exist, fine
pass
if not hostname:
@@ -84,7 +84,7 @@ class BrokerHandler(SharedHandler):
# ip address
try:
hostname = socket.gethostbyaddr(my_ip_addr)[0]
- except:
+ except Exception:
# unknown host, we don't have a hostname?
pass
if not hostname:
10 years, 9 months
Changes to 'refs/tags/spacewalk-proxy-2.1.3-1'
by StephenHerr
Tag 'spacewalk-proxy-2.1.3-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-08-23 18:47 +0000
Tagging package [spacewalk-proxy] version [2.1.3-1] in directory [proxy/proxy/].
Changes since spacewalk-utils-2.1.11-1:
Stephen Herr (2):
1000586 - /etc/hosts doesn't work with proxies
Automatic commit of package [spacewalk-proxy] release [2.1.3-1].
---
proxy/proxy/broker/rhnBroker.py | 21 ++++++++++++++++++++-
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
3 files changed, 25 insertions(+), 3 deletions(-)
---
10 years, 9 months
2 commits - proxy/proxy rel-eng/packages
by StephenHerr
proxy/proxy/broker/rhnBroker.py | 21 ++++++++++++++++++++-
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
3 files changed, 25 insertions(+), 3 deletions(-)
New commits:
commit 8b67f79dfd805a87101e9fe380f7ccb119d673cc
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri Aug 23 14:47:10 2013 -0400
Automatic commit of package [spacewalk-proxy] release [2.1.3-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index 6409e2f..e4429cd 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -4,7 +4,7 @@ Group: Applications/Internet
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 2.1.2
+Version: 2.1.3
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -330,6 +330,9 @@ fi
%changelog
+* Fri Aug 23 2013 Stephen Herr <sherr(a)redhat.com> 2.1.3-1
+- 1000586 - /etc/hosts doesn't work with proxies
+
* Tue Aug 06 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.2-1
- typo fix
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index 921ccf2..7f8b17b 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-2.1.2-1 proxy/proxy/
+2.1.3-1 proxy/proxy/
commit 4273986e4c1996c6c575a4cc4ca9d2c5587acf1c
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri Aug 23 14:46:32 2013 -0400
1000586 - /etc/hosts doesn't work with proxies
diff --git a/proxy/proxy/broker/rhnBroker.py b/proxy/proxy/broker/rhnBroker.py
index b25f261..38ba721 100644
--- a/proxy/proxy/broker/rhnBroker.py
+++ b/proxy/proxy/broker/rhnBroker.py
@@ -66,8 +66,27 @@ class BrokerHandler(SharedHandler):
self.clientServerId = None
self.rhnParentXMLRPC = None
hostname = ''
+ # should *always* exist and be my ip address
+ my_ip_addr = req.headers_in['SERVER_ADDR']
if req.headers_in.has_key('Host'):
- hostname = req.headers_in['Host'] or ''
+ # the client has provided a host header
+ try:
+ if socket.gethostbyname(req.headers_in['Host']) == my_ip_addr:
+ # if host header is valid (i.e. not just an /etc/hosts
+ # entry on the client or the hostname of some other
+ # machine (say a load balancer)) then use it
+ hostname = req.headers_in['Host']
+ except:
+ # hostname probably didn't exist, fine
+ pass
+ if not hostname:
+ # okay, that didn't work, let's do a reverse dns lookup on my
+ # ip address
+ try:
+ hostname = socket.gethostbyaddr(my_ip_addr)[0]
+ except:
+ # unknown host, we don't have a hostname?
+ pass
if not hostname:
# this shouldn't happen
# socket.gethostname is a punt. Shouldn't need to do it.
10 years, 9 months
Changes to 'refs/tags/spacewalk-utils-2.1.11-1'
by Tomas Lestach
Tag 'spacewalk-utils-2.1.11-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-08-23 15:23 +0000
Tagging package [spacewalk-utils] version [2.1.11-1] in directory [utils/].
Changes since spacewalk-setup-2.1.4-1:
Tomas Lestach (1):
Automatic commit of package [spacewalk-utils] release [2.1.11-1].
---
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-utils.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
10 years, 9 months
rel-eng/packages utils/spacewalk-utils.spec
by Tomas Lestach
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-utils.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 1a319712c57dd877c6d0a96b52a973de4941f567
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Aug 23 17:23:50 2013 +0200
Automatic commit of package [spacewalk-utils] release [2.1.11-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index 648dd73..c6a9512 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-2.1.10-1 utils/
+2.1.11-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index 158789c..a3f010b 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -1,7 +1,7 @@
%define rhnroot %{_prefix}/share/rhn
Name: spacewalk-utils
-Version: 2.1.10
+Version: 2.1.11
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -88,6 +88,9 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot}
%changelog
+* Fri Aug 23 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.11-1
+- 993047 - ignore, if activation key already exists
+
* Thu Aug 22 2013 Grant Gainey <ggainey(a)redhat.com> 2.1.10-1
- 999583 - Fixes to allow scripts to work on older versions of Python and
Postgres
10 years, 9 months
Changes to 'refs/tags/spacewalk-setup-2.1.4-1'
by Tomas Lestach
Tag 'spacewalk-setup-2.1.4-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-08-23 15:23 +0000
Tagging package [spacewalk-setup] version [2.1.4-1] in directory [spacewalk/setup/].
Changes since spacewalk-java-2.1.28-1:
Tomas Lestach (1):
Automatic commit of package [spacewalk-setup] release [2.1.4-1].
---
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
10 years, 9 months
rel-eng/packages spacewalk/setup
by Tomas Lestach
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 88066439565d19f10bd7c861b3918aadb1668981
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Aug 23 17:23:09 2013 +0200
Automatic commit of package [spacewalk-setup] release [2.1.4-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index 23953c3..e2e2809 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-2.1.3-1 spacewalk/setup/
+2.1.4-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index f6430bf..14a83ae 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,7 +1,7 @@
%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
Name: spacewalk-setup
-Version: 2.1.3
+Version: 2.1.4
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -102,6 +102,9 @@ rm -rf %{buildroot}
%doc LICENSE
%changelog
+* Fri Aug 23 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.4-1
+- 997749 - help text for --managed-db
+
* Tue Jul 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.3-1
- recognize external/embedded variant
10 years, 9 months
Changes to 'refs/tags/spacewalk-java-2.1.28-1'
by Tomas Lestach
Tag 'spacewalk-java-2.1.28-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-08-23 15:20 +0000
Tagging package [spacewalk-java] version [2.1.28-1] in directory [java/].
Changes since spacewalk-java-2.1.27-1:
Tomas Lestach (5):
993047 - throw correct exception if activation key already exists
993047 - adding missing space after dot in translation strings
993047 - ignore, if activation key already exists
989275 - fix ISE when changing base channel with korean locale prefs
Automatic commit of package [spacewalk-java] release [2.1.28-1].
---
java/code/src/com/redhat/rhn/FaultException.java | 27 ++++++++++
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 2
java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java | 3 -
java/spacewalk-java.spec | 7 ++
rel-eng/packages/spacewalk-java | 2
utils/spacewalk-common-channels | 3 -
22 files changed, 54 insertions(+), 22 deletions(-)
---
10 years, 9 months