Changes to 'refs/tags/spacewalk-backend-2.1.4-1'
by Michael Mraka
Tag 'spacewalk-backend-2.1.4-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-08-02 08:44 +0000
Tagging package [spacewalk-backend] version [2.1.4-1] in directory [backend/].
Changes since spacewalk-backend-2.1.3-1:
Michael Mraka (2):
fixed variable name
Automatic commit of package [spacewalk-backend] release [2.1.4-1].
---
backend/common/rhnTB.py | 2 +-
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
10 years, 8 months
2 commits - backend/common backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/common/rhnTB.py | 2 +-
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit e9d50ae0e83c5400caa92d14a7ab77fbabf11bd8
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Aug 2 10:44:27 2013 +0200
Automatic commit of package [spacewalk-backend] release [2.1.4-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 8654e28..714e562 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 2.1.3
+Version: 2.1.4
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -639,6 +639,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Aug 02 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.4-1
+- fixed variable name
+
* Fri Aug 02 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.3-1
- handle unicode tracebacks
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index ce38790..e1fef04 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-2.1.3-1 backend/
+2.1.4-1 backend/
commit 087b84ae5eccb25dd80054cecd3a079387f5504a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Aug 2 10:30:09 2013 +0200
fixed variable name
fixing commit a8fa7557edb36e5099c8cbe72cad7479c605f03f
diff --git a/backend/common/rhnTB.py b/backend/common/rhnTB.py
index 5460b81..9ad4d64 100644
--- a/backend/common/rhnTB.py
+++ b/backend/common/rhnTB.py
@@ -149,7 +149,7 @@ def Traceback(method = None, req = None, mail = 1, ostream = sys.stderr,
if ostream:
msg = exc.getvalue()
if isinstance(msg, unicode):
- msg = the_value.encode('utf-8')
+ msg = msg.encode('utf-8')
ostream.write("%s\n" % msg)
10 years, 8 months
Changes to 'refs/tags/spacewalk-backend-2.1.3-1'
by Michael Mraka
Tag 'spacewalk-backend-2.1.3-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-08-02 07:51 +0000
Tagging package [spacewalk-backend] version [2.1.3-1] in directory [backend/].
Changes since spacewalk-setup-postgresql-2.1.1-1:
Michael Mraka (2):
handle unicode tracebacks
Automatic commit of package [spacewalk-backend] release [2.1.3-1].
---
backend/common/rhnTB.py | 6 +++++-
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
---
10 years, 8 months
2 commits - backend/common backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/common/rhnTB.py | 6 +++++-
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
New commits:
commit 7187d783e5b2f10d27a3965a7dc3b6e237edd23d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Aug 2 09:51:41 2013 +0200
Automatic commit of package [spacewalk-backend] release [2.1.3-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 50c284e..8654e28 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 2.1.2
+Version: 2.1.3
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -639,6 +639,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Aug 02 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.3-1
+- handle unicode tracebacks
+
* Mon Jul 29 2013 Stephen Herr <sherr(a)redhat.com> 2.1.2-1
- 960550 - the "Deploy confguration files" box is never checked for kickstarts
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 2723f41..ce38790 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-2.1.2-1 backend/
+2.1.3-1 backend/
commit a8fa7557edb36e5099c8cbe72cad7479c605f03f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Aug 2 09:48:57 2013 +0200
handle unicode tracebacks
fixing
...
File "/usr/lib/python2.6/site-packages/spacewalk/server/apacheRequest.py", line 175, in call_function
Traceback(method, self.req, severity="unhandled")
File "/usr/lib/python2.6/site-packages/spacewalk/common/rhnTB.py", line 150, in Traceback
ostream.write("%s\\n" % exc.getvalue().encode('utf-8'))
File "/usr/lib64/python2.6/StringIO.py", line 270, in getvalue
self.buf += ''.join(self.buflist)
UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 48: ordinal not in range(128)
diff --git a/backend/common/rhnTB.py b/backend/common/rhnTB.py
index ec06007..5460b81 100644
--- a/backend/common/rhnTB.py
+++ b/backend/common/rhnTB.py
@@ -147,7 +147,11 @@ def Traceback(method = None, req = None, mail = 1, ostream = sys.stderr,
# we always log it somewhere
if ostream:
- ostream.write("%s\n" % exc.getvalue().encode('utf-8'))
+ msg = exc.getvalue()
+ if isinstance(msg, unicode):
+ msg = the_value.encode('utf-8')
+ ostream.write("%s\n" % msg)
+
if mail:
# print the stack frames for the mail we send out
10 years, 8 months
Changes to 'refs/tags/spacewalk-setup-postgresql-2.1.1-1'
by mkollar
Tag 'spacewalk-setup-postgresql-2.1.1-1' created by Matej Kollar <mkollar(a)redhat.com> at 2013-08-01 11:55 +0000
Tagging package [spacewalk-setup-postgresql] version [2.1.1-1] in directory [spacewalk/spacewalk-setup-postgresql/].
Changes since rhnpush-5.5.66-1:
Matej Kollar (2):
982560 - Checking validity of user-provided addresses
Automatic commit of package [spacewalk-setup-postgresql] release [2.1.1-1].
---
rel-eng/packages/spacewalk-setup-postgresql | 2
spacewalk/spacewalk-setup-postgresql/bin/spacewalk-setup-postgresql | 55 ++++++++--
spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec | 6 -
3 files changed, 55 insertions(+), 8 deletions(-)
---
10 years, 8 months
rel-eng/packages spacewalk/spacewalk-setup-postgresql
by mkollar
rel-eng/packages/spacewalk-setup-postgresql | 2 +-
spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 994dad50270bd3db8d4abee482b782a9a1e14696
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Aug 1 13:55:52 2013 +0200
Automatic commit of package [spacewalk-setup-postgresql] release [2.1.1-1].
diff --git a/rel-eng/packages/spacewalk-setup-postgresql b/rel-eng/packages/spacewalk-setup-postgresql
index 20a6570..fc68d6c 100644
--- a/rel-eng/packages/spacewalk-setup-postgresql
+++ b/rel-eng/packages/spacewalk-setup-postgresql
@@ -1 +1 @@
-2.0.1-1 spacewalk/spacewalk-setup-postgresql/
+2.1.1-1 spacewalk/spacewalk-setup-postgresql/
diff --git a/spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec b/spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec
index 3bfa081..74b20f8 100644
--- a/spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec
+++ b/spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup-postgresql
-Version: 2.1.0
+Version: 2.1.1
Release: 1%{?dist}
Summary: Tools to setup embedded PostgreSQL database for Spacewalk
Group: Applications/System
@@ -50,6 +50,10 @@ rm -rf %{buildroot}
%{_datadir}/spacewalk/setup/defaults.d/*
%changelog
+* Thu Aug 01 2013 Matej Kollar <mkollar(a)redhat.com> 2.1.1-1
+- 982560 - Checking validity of user-provided addresses
+- Bumping package versions for 2.1.
+
* Wed Jul 17 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.0.1-1
- Bumping package versions for 2.0.
10 years, 8 months
spacewalk/spacewalk-setup-postgresql
by mkollar
spacewalk/spacewalk-setup-postgresql/bin/spacewalk-setup-postgresql | 55 ++++++++--
1 file changed, 49 insertions(+), 6 deletions(-)
New commits:
commit 8d5a617a79e627597015b131a54949cadfbf86c3
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Aug 1 13:48:14 2013 +0200
982560 - Checking validity of user-provided addresses
diff --git a/spacewalk/spacewalk-setup-postgresql/bin/spacewalk-setup-postgresql b/spacewalk/spacewalk-setup-postgresql/bin/spacewalk-setup-postgresql
index ff2834d..3ec6992 100755
--- a/spacewalk/spacewalk-setup-postgresql/bin/spacewalk-setup-postgresql
+++ b/spacewalk/spacewalk-setup-postgresql/bin/spacewalk-setup-postgresql
@@ -28,12 +28,55 @@ help() {
ask() {
if $1; then
- read -p "$2" $3
+ read -e -p "$2" $3
else
- read -s -p "$2" $3
+ read -e -s -p "$2" $3 && echo
fi
}
+ask_check() {
+ while true; do
+ ask "$1" "$2" $3 || echo
+ [[ "${!3}" =~ $4 ]] && break
+ done
+}
+
+def_regexes() {
+ local digit seqence n
+ local IPv4_addr IPv4_mask IPv6_addr IPv6_mask
+ digit='([0-9]|[1-9][0-9]|1[0-9][0-9]|2([0-4][0-9]|5[0-5]))'
+ IPv4_addr="($digit\\.){3}$digit"
+ IPv4_mask='([0-9]|[12][0-9]|3[012])'
+
+ seqence='[[:digit:]abcdefABCDEF]{1,4}'
+ IPv6_addr="$seqence(:$seqence){7}|::"
+
+ # shortened
+ IPv6_addr+="|:(:$seqence){1,7}"
+ for n in 1 2 3 4 5 6; do
+ IPv6_addr+="|($seqence:){$n}(:|(:$seqence){1,$((7-n))})"
+ done
+ IPv6_addr+="|($seqence:){7}:"
+
+ # with IPv4 mixed
+
+ IPv6_addr+="|($seqence:){6}$IPv4_addr|::$IPv4_addr"
+ for n in 1 2 3 4 5; do
+ IPv6_addr+="|($seqence:){$n}(:$seqence){0,$((5-n))}:$IPv4_addr"
+ done
+
+ # final wrap
+ IPv6_addr="($IPv6_addr)"
+ IPv6_mask="([0-9]|[1-9][0-9]|1[01][0-9]|12[0-8])"
+
+ local addr="[[:space:]]*($IPv4_addr|$IPv6_addr)[[:space:]]*"
+ Local_RE="([[:space:]]*|($addr,)*$addr)"
+ local masked="[[:space:]]*($IPv4_addr/$IPv4_mask|$IPv6_addr/$IPv6_mask)[[:space:]]*"
+ Remote_RE="([[:space:]]*|($masked,)*$masked)"
+}
+def_regexes
+unset -f def_regexes
+
PG_DATA=/var/lib/pgsql/data
PG_HBA="$PG_DATA/pg_hba.conf"
POSTGRESQL="$PG_DATA/postgresql.conf"
@@ -47,12 +90,12 @@ RHN_CONF="/etc/rhn/rhn.conf"
create() {
[ -z "$PGNAME" ] && ask true "Database name: " PGNAME
[ -z "$PGUSER" ] && ask true "Database user: " PGUSER
- [ -z "$PGPASSWORD" ] && ask false "Database password: " PGPASSWORD && echo
+ [ -z "$PGPASSWORD" ] && ask false "Database password: " PGPASSWORD
if $STANDALONE; then
- [ -z "$ADDRESS" ] && ask true "Local addresses to listen on (comma-separated, RETURN for all): " ADDRESS
+ [ -z "$ADDRESS" ] && ask_check true "Local addresses to listen on (comma-separated, RETURN for all): " ADDRESS "^|$Local_RE\$"
[ -z "$ADDRESS" ] && ADDRESS="*"
- [ -z "$REMOTE" ] && ask true "Remote addresses to allow connection from (address/netmask format, comma-separated): " REMOTE
+ [ -z "$REMOTE" ] && ask_check true "Remote addresses to allow connection from (address/netmask format, comma-separated): " REMOTE "^$Remote_RE\$"
fi
postgresql_service enable
@@ -103,7 +146,7 @@ local postgres postgres ident
EOF
if $STANDALONE; then
- for ADDR in $(echo $REMOTE|sed 's/,/ /g' ); do
+ for ADDR in $(echo $REMOTE|sed 's/,/ /g'); do
cat >> $PG_HBA <<EOF
host $PGNAME $PGUSER $ADDR md5
EOF
10 years, 8 months
Changes to 'refs/tags/rhnpush-5.5.66-1'
by Jan Dobes
Tag 'rhnpush-5.5.66-1' created by Jan Dobes <jdobes(a)redhat.com> at 2013-08-01 11:15 +0000
Tagging package [rhnpush] version [5.5.66-1] in directory [client/tools/rhnpush/].
Changes since spacewalk-java-2.1.9-1:
Jan Dobes (2):
990366 - rhnpush can have specified SSL cert by parameter
Automatic commit of package [rhnpush] release [5.5.66-1].
---
client/tools/rhnpush/rhnpush.py | 3 ++-
client/tools/rhnpush/rhnpush.spec | 5 ++++-
rel-eng/packages/rhnpush | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
10 years, 8 months
2 commits - client/tools rel-eng/packages
by Jan Dobes
client/tools/rhnpush/rhnpush.py | 3 ++-
client/tools/rhnpush/rhnpush.spec | 5 ++++-
rel-eng/packages/rhnpush | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit d2ea6d0c0aa91469056c42dd4c5f933ebc744330
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Thu Aug 1 13:15:32 2013 +0200
Automatic commit of package [rhnpush] release [5.5.66-1].
diff --git a/client/tools/rhnpush/rhnpush.spec b/client/tools/rhnpush/rhnpush.spec
index f988b17..22cbe52 100644
--- a/client/tools/rhnpush/rhnpush.spec
+++ b/client/tools/rhnpush/rhnpush.spec
@@ -4,7 +4,7 @@ Name: rhnpush
Group: Applications/System
License: GPLv2
URL: http://fedorahosted.org/spacewalk
-Version: 5.5.65
+Version: 5.5.66
Release: 1%{?dist}
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -75,6 +75,9 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot}
%doc COPYING
%changelog
+* Thu Aug 01 2013 Jan Dobes 5.5.66-1
+- 990366 - rhnpush can have specified SSL cert by parameter
+
* Mon Jun 17 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.5.65-1
- branding fixes in man pages
diff --git a/rel-eng/packages/rhnpush b/rel-eng/packages/rhnpush
index f3550cb..ab39aab 100644
--- a/rel-eng/packages/rhnpush
+++ b/rel-eng/packages/rhnpush
@@ -1 +1 @@
-5.5.65-1 client/tools/rhnpush/
+5.5.66-1 client/tools/rhnpush/
commit ce4aedce10bfb16bc4dacf32bf9441ad55f286c5
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Thu Aug 1 13:08:49 2013 +0200
990366 - rhnpush can have specified SSL cert by parameter
diff --git a/client/tools/rhnpush/rhnpush.py b/client/tools/rhnpush/rhnpush.py
index bbd8bc2..0a8bfe8 100755
--- a/client/tools/rhnpush/rhnpush.py
+++ b/client/tools/rhnpush/rhnpush.py
@@ -79,7 +79,8 @@ def main():
Option( '--no-session-caching', action='store_true',
help='Disables session-token authentication.'),
Option( '--tolerant', action='store_true',
- help='If rhnpush errors while uploading a package, continue uploading the rest of the packages.')
+ help='If rhnpush errors while uploading a package, continue uploading the rest of the packages.'),
+ Option( '--ca-chain', action='store', help='alternative SSL CA Cert')
]
# pylint: enable=C0301
10 years, 8 months