Changes to 'refs/tags/spacewalk-schema-2.1.3-1'
by Tomas Lestach
Tag 'spacewalk-schema-2.1.3-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-07-25 15:30 +0000
Tagging package [spacewalk-schema] version [2.1.3-1] in directory [schema/spacewalk/].
Changes since spacewalk-koan-2.1.1-1:
Tomas Lestach (2):
recreate logging triggers after we change the logging table column types
Automatic commit of package [spacewalk-schema] release [2.1.3-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/005-logging-recreate-triggers.sql.oracle | 6 ++++++
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/005-logging-recreate-triggers.sql.postgresql | 5 +++++
4 files changed, 16 insertions(+), 2 deletions(-)
---
10 years, 2 months
2 commits - rel-eng/packages schema/spacewalk
by Tomas Lestach
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/005-logging-recreate-triggers.sql.oracle | 6 ++++++
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/005-logging-recreate-triggers.sql.postgresql | 5 +++++
4 files changed, 16 insertions(+), 2 deletions(-)
New commits:
commit 934f8dbcc79b79e99670229fd8f6447658568e9c
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jul 25 17:30:33 2013 +0200
Automatic commit of package [spacewalk-schema] release [2.1.3-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index feca68d..c8b6565 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-2.1.2-1 schema/spacewalk/
+2.1.3-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index cbdb6db..5d9bcb0 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -4,7 +4,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 2.1.2
+Version: 2.1.3
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Thu Jul 25 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.3-1
+- recreate logging triggers after we change the logging table column types
+
* Wed Jul 24 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.2-1
- fix oracle equivalent source sha1
- fix_f624b843
commit c778b1cbbcd916908c9d822f2b4ae67189f88180
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jul 25 17:30:04 2013 +0200
recreate logging triggers after we change the logging table column types
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/005-logging-recreate-triggers.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/005-logging-recreate-triggers.sql.oracle
new file mode 100644
index 0000000..d4a9426
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/005-logging-recreate-triggers.sql.oracle
@@ -0,0 +1,6 @@
+begin logging.recreate_trigger('web_contact'); end;
+/
+begin logging.recreate_trigger('rhnserver'); end;
+/
+begin logging.recreate_trigger('rhnservergroup'); end;
+/
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/005-logging-recreate-triggers.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/005-logging-recreate-triggers.sql.postgresql
new file mode 100644
index 0000000..bf70bef
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/005-logging-recreate-triggers.sql.postgresql
@@ -0,0 +1,5 @@
+-- oracle equivalent source sha1 8010783526a5b9528c26336d99a4412c1a8aa1c3
+
+select logging.recreate_trigger('web_contact');
+select logging.recreate_trigger('rhnserver');
+select logging.recreate_trigger('rhnservergroup');
10 years, 2 months
Changes to 'refs/tags/spacewalk-koan-2.1.1-1'
by StephenHerr
Tag 'spacewalk-koan-2.1.1-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-07-25 15:07 +0000
Tagging package [spacewalk-koan] version [2.1.1-1] in directory [client/tools/spacewalk-koan/].
Changes since spacewalk-backend-2.1.1-1:
Stephen Herr (2):
988428 - Mark spacewalk-koan as correctly requiring the xz package
Automatic commit of package [spacewalk-koan] release [2.1.1-1].
---
client/tools/spacewalk-koan/spacewalk-koan.spec | 7 ++++++-
rel-eng/packages/spacewalk-koan | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
---
10 years, 2 months
2 commits - client/tools rel-eng/packages
by StephenHerr
client/tools/spacewalk-koan/spacewalk-koan.spec | 7 ++++++-
rel-eng/packages/spacewalk-koan | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 9157e6de723ac2e897dc264f097697a25a1c1c36
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Jul 25 11:07:37 2013 -0400
Automatic commit of package [spacewalk-koan] release [2.1.1-1].
diff --git a/client/tools/spacewalk-koan/spacewalk-koan.spec b/client/tools/spacewalk-koan/spacewalk-koan.spec
index 80e5227..105d17a 100644
--- a/client/tools/spacewalk-koan/spacewalk-koan.spec
+++ b/client/tools/spacewalk-koan/spacewalk-koan.spec
@@ -3,7 +3,7 @@ Name: spacewalk-koan
Group: System Environment/Kernel
License: GPLv2
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 2.1.0
+Version: 2.1.1
Release: 1%{?dist}
BuildArch : noarch
URL: https://fedorahosted.org/spacewalk
@@ -47,6 +47,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/rhn/actions/
%changelog
+* Thu Jul 25 2013 Stephen Herr <sherr(a)redhat.com> 2.1.1-1
+- 988428 - Mark spacewalk-koan as correctly requiring the xz package
+- 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.
diff --git a/rel-eng/packages/spacewalk-koan b/rel-eng/packages/spacewalk-koan
index 8e36b13..e7b9e6f 100644
--- a/rel-eng/packages/spacewalk-koan
+++ b/rel-eng/packages/spacewalk-koan
@@ -1 +1 @@
-2.0.1-1 client/tools/spacewalk-koan/
+2.1.1-1 client/tools/spacewalk-koan/
commit 843f1232dcc8ba9263f43f15669f184d56ed9e9d
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Jul 25 11:07:23 2013 -0400
988428 - Mark spacewalk-koan as correctly requiring the xz package
diff --git a/client/tools/spacewalk-koan/spacewalk-koan.spec b/client/tools/spacewalk-koan/spacewalk-koan.spec
index dab9524..80e5227 100644
--- a/client/tools/spacewalk-koan/spacewalk-koan.spec
+++ b/client/tools/spacewalk-koan/spacewalk-koan.spec
@@ -12,6 +12,7 @@ BuildArch: noarch
BuildRequires: python
Requires: python >= 1.5
Requires: koan >= 1.4.3
+Requires: xz
%if 0%{?suse_version}
# provide directories for filelist check in OBS
BuildRequires: rhn-client-tools
10 years, 2 months
Changes to 'refs/tags/spacewalk-backend-2.1.1-1'
by Michael Mraka
Tag 'spacewalk-backend-2.1.1-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-07-25 14:30 +0000
Tagging package [spacewalk-backend] version [2.1.1-1] in directory [backend/].
Changes since spacewalk-oscap-0.0.19-1:
Michael Mraka (2):
803837 - process includepkgs and exclude from yum.conf
Automatic commit of package [spacewalk-backend] release [2.1.1-1].
---
backend/satellite_tools/repo_plugins/yum_src.py | 8 ++++++++
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 13 insertions(+), 2 deletions(-)
---
10 years, 2 months
2 commits - backend/satellite_tools backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/satellite_tools/repo_plugins/yum_src.py | 8 ++++++++
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 13 insertions(+), 2 deletions(-)
New commits:
commit c2ed72f19ea75b517633f8d3de10db831b7ca1ae
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jul 25 16:30:44 2013 +0200
Automatic commit of package [spacewalk-backend] release [2.1.1-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 4516d76..9007251 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.0
+Version: 2.1.1
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
+* Thu Jul 25 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.1-1
+- 803837 - process includepkgs and exclude from yum.conf
+
* Thu Jul 18 2013 Jan Dobes 2.0.3-1
- 645435 - log per channel instead of session
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 2c71c3a..6346bd8 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-2.0.3-1 backend/
+2.1.1-1 backend/
commit 439593537cc9a1afa5e3f8b8877c3b124423b406
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jul 25 16:26:14 2013 +0200
803837 - process includepkgs and exclude from yum.conf
diff --git a/backend/satellite_tools/repo_plugins/yum_src.py b/backend/satellite_tools/repo_plugins/yum_src.py
index 3658289..e4244e6 100644
--- a/backend/satellite_tools/repo_plugins/yum_src.py
+++ b/backend/satellite_tools/repo_plugins/yum_src.py
@@ -159,6 +159,14 @@ class ContentSource(object):
self.sack.populate(self.repo, 'metadata', None, 0)
pkglist = self.sack.returnPackages()
self.num_packages = len(pkglist)
+
+ if not filters:
+ # if there's no include/exclude filter on command line or in database
+ for p in self.repo.includepkgs:
+ filters.append(('+',[filter_conf]))
+ for p in self.repo.exclude:
+ filters.append(('-',[filter_conf]))
+
if filters:
pkglist = self._filter_packages(pkglist, filters)
pkglist = self._get_package_dependencies(self.sack, pkglist)
10 years, 2 months
Changes to 'refs/tags/spacewalk-oscap-0.0.19-1'
by Šimon Lukašík
Tag 'spacewalk-oscap-0.0.19-1' created by Simon Lukasik <slukasik(a)redhat.com> at 2013-07-25 12:10 +0000
Tagging package [spacewalk-oscap] version [0.0.19-1] in directory [client/rhel/spacewalk-oscap/].
Changes since spacewalk-oscap-0.0.18-1:
Simon Lukasik (2):
Do not try to parse xccdf-report.html with SAX parser
Automatic commit of package [spacewalk-oscap] release [0.0.19-1].
---
client/rhel/spacewalk-oscap/scap.py | 2 +-
client/rhel/spacewalk-oscap/spacewalk-oscap.spec | 5 ++++-
rel-eng/packages/spacewalk-oscap | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
10 years, 2 months
client/rhel rel-eng/packages
by Šimon Lukašík
client/rhel/spacewalk-oscap/spacewalk-oscap.spec | 5 ++++-
rel-eng/packages/spacewalk-oscap | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit d04c3c0e7b1cd0764158ce49079ad5b5b82297a3
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu Jul 25 14:10:57 2013 +0200
Automatic commit of package [spacewalk-oscap] release [0.0.19-1].
diff --git a/client/rhel/spacewalk-oscap/spacewalk-oscap.spec b/client/rhel/spacewalk-oscap/spacewalk-oscap.spec
index 5399bae..e01009e 100644
--- a/client/rhel/spacewalk-oscap/spacewalk-oscap.spec
+++ b/client/rhel/spacewalk-oscap/spacewalk-oscap.spec
@@ -1,5 +1,5 @@
Name: spacewalk-oscap
-Version: 0.0.18
+Version: 0.0.19
Release: 1%{?dist}
Summary: OpenSCAP plug-in for rhn-check
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Jul 25 2013 Simon Lukasik <slukasik(a)redhat.com> 0.0.19-1
+- Do not try to parse xccdf-report.html with SAX parser
+
* Wed Jul 24 2013 Simon Lukasik <slukasik(a)redhat.com> 0.0.18-1
- Log exception in the file, when non XML encountered.
diff --git a/rel-eng/packages/spacewalk-oscap b/rel-eng/packages/spacewalk-oscap
index 2e864ef..c950fec 100644
--- a/rel-eng/packages/spacewalk-oscap
+++ b/rel-eng/packages/spacewalk-oscap
@@ -1 +1 @@
-0.0.18-1 client/rhel/spacewalk-oscap/
+0.0.19-1 client/rhel/spacewalk-oscap/
10 years, 2 months
client/rhel
by Šimon Lukašík
client/rhel/spacewalk-oscap/scap.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit bba72173bd74407120e3c600e33765ea1fda4f47
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu Jul 25 14:07:02 2013 +0200
Do not try to parse xccdf-report.html with SAX parser
As the SAX parser attempts to download the following files:
http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd
http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent
http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent
http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent
Additionally, if you have had slow DNS server, and PyXML not installed
you might have encountered parser failures.
Addressing:
[Thu Jul 25 11:51:06 2013] up2date
Traceback (most recent call last):
File "/usr/share/rhn/actions/scap.py", line 163, in _assert_xml
xml.sax.parse(f, xml.sax.ContentHandler())
File "/usr/lib64/python2.6/xml/sax/__init__.py", line 33, in parse
parser.parse(source)
File "/usr/lib64/python2.6/xml/sax/expatreader.py", line 107, in parse
xmlreader.IncrementalParser.parse(self, source)
File "/usr/lib64/python2.6/xml/sax/xmlreader.py", line 123, in parse
self.feed(buffer)
File "/usr/lib64/python2.6/xml/sax/expatreader.py", line 207, in feed
self._parser.Parse(data, isFinal)
File "/usr/lib64/python2.6/xml/sax/expatreader.py", line 381, in external_entity_ref
"")
File "/usr/lib64/python2.6/xml/sax/saxutils.py", line 298, in prepare_input_source
f = urllib.urlopen(source.getSystemId())
File "/usr/lib64/python2.6/urllib.py", line 86, in urlopen
return opener.open(url)
File "/usr/lib64/python2.6/urllib.py", line 207, in open
return getattr(self, name)(url)
File "/usr/lib64/python2.6/urllib.py", line 346, in open_http
h.endheaders()
File "/usr/lib64/python2.6/httplib.py", line 908, in endheaders
self._send_output()
File "/usr/lib64/python2.6/httplib.py", line 780, in _send_output
self.send(msg)
File "/usr/lib64/python2.6/httplib.py", line 739, in send
self.connect()
File "/usr/lib64/python2.6/httplib.py", line 720, in connect
self.timeout)
File "/usr/lib64/python2.6/socket.py", line 553, in create_connection
for res in getaddrinfo(host, port, 0, SOCK_STREAM):
<type 'exceptions.IOError'>: [Errno socket error] [Errno -2] Name or service not known
diff --git a/client/rhel/spacewalk-oscap/scap.py b/client/rhel/spacewalk-oscap/scap.py
index 9891857..c441a2a 100644
--- a/client/rhel/spacewalk-oscap/scap.py
+++ b/client/rhel/spacewalk-oscap/scap.py
@@ -131,7 +131,7 @@ def _upload_results(xccdf_result, results_dir, args):
return errors
def _upload_file(server, systemid, args, path, filename, f):
- if not _assert_xml(f):
+ if filename != 'xccdf-report.html' and not _assert_xml(f):
log.log_debug('Excluding "%s" file from upload. Not an XML.', path)
return '\nxccdf_eval: File "%s" not uploaded. Not an XML file format.' % filename
10 years, 2 months
Changes to 'refs/tags/spacewalk-oscap-0.0.18-1'
by Šimon Lukašík
Tag 'spacewalk-oscap-0.0.18-1' created by Simon Lukasik <slukasik(a)redhat.com> at 2013-07-24 16:36 +0000
Tagging package [spacewalk-oscap] version [0.0.18-1] in directory [client/rhel/spacewalk-oscap/].
Changes since spacewalk-java-2.1.6-1:
Simon Lukasik (2):
Log exception in the file, when non XML encountered.
Automatic commit of package [spacewalk-oscap] release [0.0.18-1].
---
client/rhel/spacewalk-oscap/scap.py | 3 ++-
client/rhel/spacewalk-oscap/spacewalk-oscap.spec | 5 ++++-
rel-eng/packages/spacewalk-oscap | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
10 years, 2 months