19 commits - client/debian client/rhel rel-eng/packages
by Miroslav Suchý
client/debian/rhn-client-tools/debian/changelog | 4 -
client/debian/rhn-client-tools/debian/copyright | 24 ++--------
client/debian/rhn-client-tools/debian/pycompat | 1
client/debian/rhn-client-tools/debian/rules | 2
client/debian/rhnlib/debian/changelog | 7 +-
client/debian/rhnlib/debian/control | 13 ++---
client/debian/rhnlib/debian/copyright | 9 ++-
client/debian/rhnlib/debian/docs | 2
client/debian/rhnlib/debian/pycompat | 1
client/debian/rhnlib/debian/python-rhnlib.dsc | 15 ------
client/debian/rhnlib/debian/rules | 8 +--
client/rhel/rhn-client-tools/man/en/rhn-profile-sync.8 | 3 -
client/rhel/rhn-client-tools/man/en/rhn_check.8 | 3 -
client/rhel/rhn-client-tools/man/en/rhn_register.8 | 3 -
client/rhel/rhn-client-tools/man/en/rhnreg_ks.8 | 3 -
client/rhel/rhn-client-tools/man/en/spacewalk-channel.8 | 3 -
client/rhel/rhn-client-tools/man/en/up2date.5 | 3 -
client/rhel/rhn-client-tools/rhn-client-tools.spec | 7 ++
client/rhel/rhn-client-tools/src/actions/hardware.py | 2
client/rhel/rhn-client-tools/src/actions/reboot.py | 2
client/rhel/rhn-client-tools/src/actions/rhnsd.py | 2
client/rhel/rhn-client-tools/src/actions/systemid.py | 2
client/rhel/rhn-client-tools/src/actions/up2date_config.py | 2
client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py | 2
client/rhel/rhn-client-tools/src/bin/rhn_register.py | 2
client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py | 2
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_channel.py | 3 -
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_server_gui.py | 3 -
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_create_profile_gui.py | 3 -
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_finish_gui.py | 3 -
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_login_gui.py | 3 -
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_provide_certificate_gui.py | 3 -
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_review_gui.py | 3 -
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_start_gui.py | 3 -
client/rhel/rhn-client-tools/src/firstboot/rhn_choose_channel.py | 3 -
client/rhel/rhn-client-tools/src/firstboot/rhn_choose_server_gui.py | 3 -
client/rhel/rhn-client-tools/src/firstboot/rhn_create_profile_gui.py | 3 -
client/rhel/rhn-client-tools/src/firstboot/rhn_finish_gui.py | 3 -
client/rhel/rhn-client-tools/src/firstboot/rhn_login_gui.py | 3 -
client/rhel/rhn-client-tools/src/firstboot/rhn_provide_certificate_gui.py | 3 -
client/rhel/rhn-client-tools/src/firstboot/rhn_register.py | 3 -
client/rhel/rhn-client-tools/src/firstboot/rhn_review_gui.py | 3 -
client/rhel/rhn-client-tools/src/firstboot/rhn_start_gui.py | 3 -
client/rhel/rhn-client-tools/src/up2date_client/debUtils.py | 2
client/rhel/rhn-client-tools/src/up2date_client/getMethod.py | 2
client/rhel/rhn-client-tools/src/up2date_client/gui.py | 2
client/rhel/rhn-client-tools/src/up2date_client/pkgUtils.py | 2
client/rhel/rhn-client-tools/src/up2date_client/pkgplatform.py | 2
client/rhel/rhn-client-tools/src/up2date_client/rhnserver.py | 3 -
client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py | 2
client/rhel/rhn-client-tools/src/up2date_client/transaction.py | 2
client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py | 2
client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py | 2
client/rhel/rhn-client-tools/test/alltests.py | 3 -
client/rhel/rhn-client-tools/test/haltreetests.py | 3 -
client/rhel/rhn-client-tools/test/settestpath.py | 3 -
client/rhel/yum-rhn-plugin/actions/errata.py | 2
rel-eng/packages/rhn-client-tools | 2
58 files changed, 80 insertions(+), 132 deletions(-)
New commits:
commit 05f38a234dc97f44dc79acfa4a4d2e63ff259fd3
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jun 15 23:10:20 2012 +0200
Automatic commit of package [rhn-client-tools] release [1.8.5-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 67e26e9..5757b03 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 1.8.4
+Version: 1.8.5
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -339,6 +339,11 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Fri Jun 15 2012 Miroslav Suchý 1.8.5-1
+- fix files header, filese are not released under GPLv2+ but only GPLv2
+- fix files headers. our code is under gplv2 license
+- %%defattr is not needed since rpm 4.4
+
* Wed May 02 2012 Milan Zazrivec <mzazrivec(a)redhat.com> 1.8.4-1
- 816199 - fix package dependency on newt
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 72eb928..235e005 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.8.4-1 client/rhel/rhn-client-tools/
+1.8.5-1 client/rhel/rhn-client-tools/
commit df96bfa09f6afedeb2b925da79d0d7b01fe24c28
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jun 15 23:09:06 2012 +0200
fix files header, filese are not released under GPLv2+ but only GPLv2
diff --git a/client/rhel/rhn-client-tools/man/en/rhn-profile-sync.8 b/client/rhel/rhn-client-tools/man/en/rhn-profile-sync.8
index 8ea1ff4..c916304 100644
--- a/client/rhel/rhn-client-tools/man/en/rhn-profile-sync.8
+++ b/client/rhel/rhn-client-tools/man/en/rhn-profile-sync.8
@@ -2,8 +2,7 @@
.\"
.\" This man page is free documentation; you can redistribute it and/or modify
.\" it under the terms of the GNU General Public License as published by
-.\" the Free Software Foundation; either version 2 of the License, or
-.\" (at your option) any later version.
+.\" the Free Software Foundation; version 2 of the License
.\"
.\" This program is distributed in the hope that it will be useful,
.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/man/en/rhn_check.8 b/client/rhel/rhn-client-tools/man/en/rhn_check.8
index 34a7820..a9236cf 100644
--- a/client/rhel/rhn-client-tools/man/en/rhn_check.8
+++ b/client/rhel/rhn-client-tools/man/en/rhn_check.8
@@ -2,8 +2,7 @@
.\"
.\" This man page is free documentation; you can redistribute it and/or modify
.\" it under the terms of the GNU General Public License as published by
-.\" the Free Software Foundation; either version 2 of the License, or
-.\" (at your option) any later version.
+.\" the Free Software Foundation; version 2 of the License.
.\"
.\" This program is distributed in the hope that it will be useful,
.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/man/en/rhn_register.8 b/client/rhel/rhn-client-tools/man/en/rhn_register.8
index a295348..6f50193 100644
--- a/client/rhel/rhn-client-tools/man/en/rhn_register.8
+++ b/client/rhel/rhn-client-tools/man/en/rhn_register.8
@@ -2,8 +2,7 @@
.\"
.\" This man page is free documentation; you can redistribute it and/or modify
.\" it under the terms of the GNU General Public License as published by
-.\" the Free Software Foundation; either version 2 of the License, or
-.\" (at your option) any later version.
+.\" the Free Software Foundation; version 2 of the License.
.\"
.\" This program is distributed in the hope that it will be useful,
.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/man/en/rhnreg_ks.8 b/client/rhel/rhn-client-tools/man/en/rhnreg_ks.8
index aac4bb9..a4d58df 100644
--- a/client/rhel/rhn-client-tools/man/en/rhnreg_ks.8
+++ b/client/rhel/rhn-client-tools/man/en/rhnreg_ks.8
@@ -2,8 +2,7 @@
.\"
.\" This man page is free documentation; you can redistribute it and/or modify
.\" it under the terms of the GNU General Public License as published by
-.\" the Free Software Foundation; either version 2 of the License, or
-.\" (at your option) any later version.
+.\" the Free Software Foundation; version 2 of the License.
.\"
.\" This program is distributed in the hope that it will be useful,
.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/man/en/spacewalk-channel.8 b/client/rhel/rhn-client-tools/man/en/spacewalk-channel.8
index 5c0edc6..8bb986d 100644
--- a/client/rhel/rhn-client-tools/man/en/spacewalk-channel.8
+++ b/client/rhel/rhn-client-tools/man/en/spacewalk-channel.8
@@ -2,8 +2,7 @@
.\"
.\" This man page is free documentation; you can redistribute it and/or modify
.\" it under the terms of the GNU General Public License as published by
-.\" the Free Software Foundation; either version 2 of the License, or
-.\" (at your option) any later version.
+.\" the Free Software Foundation; version 2 of the License.
.\"
.\" This program is distributed in the hope that it will be useful,
.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/man/en/up2date.5 b/client/rhel/rhn-client-tools/man/en/up2date.5
index 23b02a2..925cb2b 100644
--- a/client/rhel/rhn-client-tools/man/en/up2date.5
+++ b/client/rhel/rhn-client-tools/man/en/up2date.5
@@ -2,8 +2,7 @@
.\"
.\" This man page is free documentation; you can redistribute it and/or modify
.\" it under the terms of the GNU General Public License as published by
-.\" the Free Software Foundation; either version 2 of the License, or
-.\" (at your option) any later version.
+.\" the Free Software Foundation; version 2 of the License.
.\"
.\" This program is distributed in the hope that it will be useful,
.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_channel.py b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_channel.py
index f82921b..3580acb 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_channel.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_channel.py
@@ -3,8 +3,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; version 2 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_server_gui.py b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_server_gui.py
index 7865c2b..6b7a3f2 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_server_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_server_gui.py
@@ -2,8 +2,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; version 2 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_create_profile_gui.py b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_create_profile_gui.py
index d35218c..ed68ad0 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_create_profile_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_create_profile_gui.py
@@ -5,8 +5,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; version 2 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_finish_gui.py b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_finish_gui.py
index ef22afe..5e3356c 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_finish_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_finish_gui.py
@@ -2,8 +2,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; version 2 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_login_gui.py b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_login_gui.py
index 267c44c..ba6adc9 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_login_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_login_gui.py
@@ -5,8 +5,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; version 2 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_provide_certificate_gui.py b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_provide_certificate_gui.py
index 41b8f73..190e348 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_provide_certificate_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_provide_certificate_gui.py
@@ -2,8 +2,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; version 2 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_review_gui.py b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_review_gui.py
index 8baaa1f..145fd13 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_review_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_review_gui.py
@@ -2,8 +2,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; version 2 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_start_gui.py b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_start_gui.py
index 5fd6f27..10ab1c6 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_start_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_start_gui.py
@@ -2,8 +2,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; version 2 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_channel.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_channel.py
index f82921b..3580acb 100644
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_channel.py
+++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_channel.py
@@ -3,8 +3,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; version 2 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_server_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_server_gui.py
index 0ec28b1..26ab09b 100644
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_server_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_server_gui.py
@@ -2,8 +2,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; version 2 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_create_profile_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_create_profile_gui.py
index 55420bb..0bfdc9f 100644
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_create_profile_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_create_profile_gui.py
@@ -3,8 +3,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; version 2 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_finish_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_finish_gui.py
index 2da0898..c7d2753 100644
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_finish_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_finish_gui.py
@@ -2,8 +2,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; version 2 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_login_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_login_gui.py
index c1a9c3b..3b8eeed 100644
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_login_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_login_gui.py
@@ -3,8 +3,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; version 2 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_provide_certificate_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_provide_certificate_gui.py
index 68aeebc..7d15316 100644
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_provide_certificate_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_provide_certificate_gui.py
@@ -2,8 +2,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; version 2 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_register.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_register.py
index 9258310..6d1081e 100644
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_register.py
+++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_register.py
@@ -2,8 +2,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; version 2 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_review_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_review_gui.py
index 5dd3b42..ced8655 100644
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_review_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_review_gui.py
@@ -2,8 +2,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; version 2 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_start_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_start_gui.py
index bb6b719..3f883a0 100644
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_start_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_start_gui.py
@@ -2,8 +2,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; version 2 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnserver.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnserver.py
index e61864c..7fe173f 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnserver.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnserver.py
@@ -5,8 +5,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; version 2 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/test/alltests.py b/client/rhel/rhn-client-tools/test/alltests.py
index 47e75c9..2aba59f 100644
--- a/client/rhel/rhn-client-tools/test/alltests.py
+++ b/client/rhel/rhn-client-tools/test/alltests.py
@@ -4,8 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; version 2 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/test/haltreetests.py b/client/rhel/rhn-client-tools/test/haltreetests.py
index fd27488..1d942d5 100644
--- a/client/rhel/rhn-client-tools/test/haltreetests.py
+++ b/client/rhel/rhn-client-tools/test/haltreetests.py
@@ -4,8 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; version 2 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/client/rhel/rhn-client-tools/test/settestpath.py b/client/rhel/rhn-client-tools/test/settestpath.py
index 8da064e..aef55f2 100644
--- a/client/rhel/rhn-client-tools/test/settestpath.py
+++ b/client/rhel/rhn-client-tools/test/settestpath.py
@@ -4,8 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; version 2 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
commit 570c16991880e187e52af14d3845e181a9210df0
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jun 15 22:50:49 2012 +0200
fix files headers. our code is under gplv2 license
diff --git a/client/rhel/rhn-client-tools/src/actions/hardware.py b/client/rhel/rhn-client-tools/src/actions/hardware.py
index 115f8ad..f1ea787 100644
--- a/client/rhel/rhn-client-tools/src/actions/hardware.py
+++ b/client/rhel/rhn-client-tools/src/actions/hardware.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
-# Copyright (c) 1999-2002 Red Hat, Inc. Distributed under GPL.
+# Copyright (c) 1999-2002 Red Hat, Inc. Distributed under GPLv2.
#
# Author: Adrian Likins <alikins(a)redhat.com>
diff --git a/client/rhel/rhn-client-tools/src/actions/reboot.py b/client/rhel/rhn-client-tools/src/actions/reboot.py
index 2c52e05..4d3a6fb 100644
--- a/client/rhel/rhn-client-tools/src/actions/reboot.py
+++ b/client/rhel/rhn-client-tools/src/actions/reboot.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
# Client code for Update Agent
-# Copyright (c) 1999-2002 Red Hat, Inc. Distributed under GPL.
+# Copyright (c) 1999-2002 Red Hat, Inc. Distributed under GPLv2.
#
# Author: Adrian Likins <alikins(a)redhat.com
#
diff --git a/client/rhel/rhn-client-tools/src/actions/rhnsd.py b/client/rhel/rhn-client-tools/src/actions/rhnsd.py
index 83ed22b..6966c9a 100644
--- a/client/rhel/rhn-client-tools/src/actions/rhnsd.py
+++ b/client/rhel/rhn-client-tools/src/actions/rhnsd.py
@@ -1,6 +1,6 @@
#!/usr/bin/python
-# Copyright (c) 1999-2002 Red Hat, Inc. Distributed under GPL.
+# Copyright (c) 1999-2002 Red Hat, Inc. Distributed under GPLv2.
#
# Author: Adrian Likins <alikins(a)redhat.com>
#
diff --git a/client/rhel/rhn-client-tools/src/actions/systemid.py b/client/rhel/rhn-client-tools/src/actions/systemid.py
index f08226b..4282ddc 100644
--- a/client/rhel/rhn-client-tools/src/actions/systemid.py
+++ b/client/rhel/rhn-client-tools/src/actions/systemid.py
@@ -1,6 +1,6 @@
#!/usr/bin/python
#
-# Copyright (c) 1999-2002 Red Hat, Inc. Distributed under GPL.
+# Copyright (c) 1999-2002 Red Hat, Inc. Distributed under GPLv2.
#
# Author: Adrian Likins <alikins(a)redhat.com>
diff --git a/client/rhel/rhn-client-tools/src/actions/up2date_config.py b/client/rhel/rhn-client-tools/src/actions/up2date_config.py
index c050bcc..ae714a1 100644
--- a/client/rhel/rhn-client-tools/src/actions/up2date_config.py
+++ b/client/rhel/rhn-client-tools/src/actions/up2date_config.py
@@ -1,6 +1,6 @@
#!/usr/bin/python
-# Copyright (c) 1999-2002 Red Hat, Inc. Distributed under GPL.
+# Copyright (c) 1999-2002 Red Hat, Inc. Distributed under GPLv2.
#
# Author: Adrian Likins <alikins(a)redhat.com>
#
diff --git a/client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py b/client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py
index ee8f8e9..2259770 100644
--- a/client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py
+++ b/client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py
@@ -2,7 +2,7 @@
#
# Red Hat Network registration tool
# Adapted from wrapper.py
-# Copyright (c) 1999-2006 Red Hat, Inc. Distributed under GPL.
+# Copyright (c) 1999-2006 Red Hat, Inc. Distributed under GPLv2.
#
# Authors:
# Adrian Likins <alikins(a)redhat.com>
diff --git a/client/rhel/rhn-client-tools/src/bin/rhn_register.py b/client/rhel/rhn-client-tools/src/bin/rhn_register.py
index 568d82c..db081ce 100644
--- a/client/rhel/rhn-client-tools/src/bin/rhn_register.py
+++ b/client/rhel/rhn-client-tools/src/bin/rhn_register.py
@@ -2,7 +2,7 @@
#
# Red Hat Network registration tool
# Adapted from wrapper.py
-# Copyright (c) 1999-2010 Red Hat, Inc. Distributed under GPL.
+# Copyright (c) 1999-2010 Red Hat, Inc. Distributed under GPLv2.
#
# Authors:
# Adrian Likins <alikins(a)redhat.com>
diff --git a/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py b/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py
index f5abcaa..cf1c2f5 100755
--- a/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py
+++ b/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
#
# Registration client for the Red Hat Network for useage with kickstart
-# Copyright (c) 1999--2012 Red Hat, Inc. Distributed under GPL.
+# Copyright (c) 1999--2012 Red Hat, Inc. Distributed under GPLv2.
#
# Authors:
# Adrian Likins <alikins(a)redhat.com>
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/debUtils.py b/client/rhel/rhn-client-tools/src/up2date_client/debUtils.py
index ab8fc64..9ff0209 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/debUtils.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/debUtils.py
@@ -1,5 +1,5 @@
# Client code for Update Agent
-# Copyright (c) 2011--2011 Red Hat, Inc. Distributed under GPL.
+# Copyright (c) 2011--2011 Red Hat, Inc. Distributed under GPLv2.
#
# Author: Simon Lukasik
# Lukas Durfina
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/getMethod.py b/client/rhel/rhn-client-tools/src/up2date_client/getMethod.py
index 423ca35..6257c89 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/getMethod.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/getMethod.py
@@ -1,7 +1,7 @@
# Retrieve action method name given queued action information.
#
# Client code for Update Agent
-# Copyright (c) 1999-2002 Red Hat, Inc. Distributed under GPL.
+# Copyright (c) 1999-2002 Red Hat, Inc. Distributed under GPLv2.
#
# An allowable xmlrpc method is retrieved given a base location, a
# hierarchical route to the class/module, and method name.
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/gui.py b/client/rhel/rhn-client-tools/src/up2date_client/gui.py
index a0d9509..53603a4 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/gui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/gui.py
@@ -1,6 +1,6 @@
#
# GUI for Update Agent
-# Copyright (c) 1999-2010 Red Hat, Inc. Distributed under GPL.
+# Copyright (c) 1999-2010 Red Hat, Inc. Distributed under GPLv2.
#
# Authors:
# Preston Brown <pbrown(a)redhat.com>
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/pkgUtils.py b/client/rhel/rhn-client-tools/src/up2date_client/pkgUtils.py
index 97de80e..b070f00 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/pkgUtils.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/pkgUtils.py
@@ -1,5 +1,5 @@
# Client code for Update Agent
-# Copyright (c) 2011--2012 Red Hat, Inc. Distributed under GPL.
+# Copyright (c) 2011--2012 Red Hat, Inc. Distributed under GPLv2.
#
# Author: Simon Lukasik
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/pkgplatform.py b/client/rhel/rhn-client-tools/src/up2date_client/pkgplatform.py
index 01420dc..3dd6359 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/pkgplatform.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/pkgplatform.py
@@ -1,5 +1,5 @@
# Client code for Update Agent
-# Copyright (c) 2011--2012 Red Hat, Inc. Distributed under GPL.
+# Copyright (c) 2011--2012 Red Hat, Inc. Distributed under GPLv2.
#
# Author: Simon Lukasik
#
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py b/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py
index 20abfd5..e89e08b 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py
@@ -1,7 +1,7 @@
# some high level utility stuff for rpm handling
# Client code for Update Agent
-# Copyright (c) 1999-2002 Red Hat, Inc. Distributed under GPL.
+# Copyright (c) 1999-2002 Red Hat, Inc. Distributed under GPLv2.
#
# Author: Preston Brown <pbrown(a)redhat.com>
# Adrian Likins <alikins(a)redhat.com>
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/transaction.py b/client/rhel/rhn-client-tools/src/up2date_client/transaction.py
index c5195c0..c0eca49 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/transaction.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/transaction.py
@@ -1,7 +1,7 @@
#
# Client code for Update Agent
-# Copyright (c) 1999-2002 Red Hat, Inc. Distributed under GPL.
+# Copyright (c) 1999-2002 Red Hat, Inc. Distributed under GPLv2.
#
# Adrian Likins <alikins(a)redhat.com
#
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
index 170570d..ae5bdc8 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
@@ -1,6 +1,6 @@
#
# Client code for Update Agent
-# Copyright (c) 1999--2012 Red Hat, Inc. Distributed under GPL.
+# Copyright (c) 1999--2012 Red Hat, Inc. Distributed under GPLv2.
#
# Author: Preston Brown <pbrown(a)redhat.com>
# Adrian Likins <alikins(a)redhat.com
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py b/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py
index 845bdd9..0da6978 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py
@@ -1,5 +1,5 @@
# Client code for Update Agent
-# Copyright (c) 1999--2012 Red Hat, Inc. Distributed under GPL.
+# Copyright (c) 1999--2012 Red Hat, Inc. Distributed under GPLv2.
#
# Author: Preston Brown <pbrown(a)redhat.com>
# Adrian Likins <alikins(a)redhat.com>
diff --git a/client/rhel/yum-rhn-plugin/actions/errata.py b/client/rhel/yum-rhn-plugin/actions/errata.py
index 03a4bb9..4891483 100644
--- a/client/rhel/yum-rhn-plugin/actions/errata.py
+++ b/client/rhel/yum-rhn-plugin/actions/errata.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
# Client code for Update Agent
-# Copyright (c) 1999-2002 Red Hat, Inc. Distributed under GPL.
+# Copyright (c) 1999-2002 Red Hat, Inc. Distributed under GPLv2.
#
# Author: Adrian Likins <alikins(a)redhat.com
#
commit 44ebba4c636796fe12e753ddc25c4799be60a0c8
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jun 15 18:29:44 2012 +0200
build with python2
diff --git a/client/debian/rhn-client-tools/debian/rules b/client/debian/rhn-client-tools/debian/rules
index 91bf044..b4e3304 100755
--- a/client/debian/rhn-client-tools/debian/rules
+++ b/client/debian/rhn-client-tools/debian/rules
@@ -13,5 +13,5 @@ override_dh_auto_install:
$(MAKE) $(params) install
%:
- dh $@
+ dh $@ --with python2
commit 03d1c2d9232f022564b5a563aa7c23a9ca28daae
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jun 15 18:28:30 2012 +0200
update changelog for python-rhn-client-tools
diff --git a/client/debian/rhn-client-tools/debian/changelog b/client/debian/rhn-client-tools/debian/changelog
index 445740a..b5d9d66 100644
--- a/client/debian/rhn-client-tools/debian/changelog
+++ b/client/debian/rhn-client-tools/debian/changelog
@@ -1,6 +1,6 @@
python-rhn-client-tools (1.6.41-1) unstable; urgency=low
- * Rebase to upstream version
+ * Initial Debian release
* 703833 - if /sbin/service is not available, try to use /usr/sbin/service
- -- Šimon Lukašík <isimluk(a)fedoraproject.org> Mon, 12 Dec 2011 12:53:49 +0200
+ -- Miroslav Suchy <miroslav(a)suchy.cz> Fri, 15 Jun 2012 18:17:35 +0200
commit f5449316d2d69ce2b792f5457890db89382ca44f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jun 15 18:27:05 2012 +0200
update copyright file for rhn-client-tools
diff --git a/client/debian/rhn-client-tools/debian/copyright b/client/debian/rhn-client-tools/debian/copyright
index c1b899c..9a578ea 100644
--- a/client/debian/rhn-client-tools/debian/copyright
+++ b/client/debian/rhn-client-tools/debian/copyright
@@ -22,23 +22,9 @@ License: GPL-2
<http://www.gnu.org/copyleft/gpl.txt> for the terms of the latest version
of the GNU General Public License.
-Files: debian/*
-Copyright: Copyright 2011 Šimon Lukašík <xlukas08(a)stud.fit.vutbr.cz>
-License: GPL-2
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- .
- See /usr/share/common-licenses/GPL-2, or
- <http://www.gnu.org/copyleft/gpl.txt> for the terms of the latest version
- of the GNU General Public License.
+The Debian packaging is
+ Copyright 2010-2012 by Red Hat Inc.
+ Copyright 2012 Bernd Zeimetz <bzed(a)debian.org>
+ Copyright 2012 Šimon Lukašík <xlukas08(a)stud.fit.vutbr.cz>
+and licensed under the same license as rhnlib, see above
commit 6958820cafb1ffb079dff88099a7eae01ead07af
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jun 15 18:11:35 2012 +0200
pycompat is deprecated
diff --git a/client/debian/rhn-client-tools/debian/pycompat b/client/debian/rhn-client-tools/debian/pycompat
deleted file mode 100644
index 0cfbf08..0000000
--- a/client/debian/rhn-client-tools/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2
commit bb08d4cca7839be5ae1d5a3f80d2b73b59ca47fe
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jun 15 18:06:34 2012 +0200
dsc file is deprecated, it is build in runtime
diff --git a/client/debian/rhnlib/debian/python-rhnlib.dsc b/client/debian/rhnlib/debian/python-rhnlib.dsc
deleted file mode 100644
index 217c99a..0000000
--- a/client/debian/rhnlib/debian/python-rhnlib.dsc
+++ /dev/null
@@ -1,15 +0,0 @@
-Format: 1.0
-Source: python-rhnlib
-Binary: python-rhnlib
-Architecture: all
-Version: 2.5.27-1
-Maintainer: Miroslav Suchý <miroslav(a)suchy.cz>
-Homepage: https://fedorahosted.org/spacewalk/
-Standards-Version: 3.7.3
-Build-Depends: python-all-dev, python-support (>= 0.8), debhelper (>= 7)
-Checksums-Sha1:
- 444fe0994b77e6a9cc8a006fd1bcb003115c9091 51389 rhnlib-2.5.27.tar.gz
-Checksums-Sha256:
- 31394cab7c60f25707c704ff2a1a722e335626ae20fc165db61d20b6be856291 51389 rhnlib-2.5.27.tar.gz
-Files:
- 3b5541a03a0690b26a2691d44076fa81 rhnlib-2.5.27.tar.gz
commit 4ca4cfaeb76b24c41bd4f34b02508f499789902f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jun 15 18:05:11 2012 +0200
build it with python2
diff --git a/client/debian/rhnlib/debian/rules b/client/debian/rhnlib/debian/rules
index d581922..e6b3ba2 100755
--- a/client/debian/rhnlib/debian/rules
+++ b/client/debian/rhnlib/debian/rules
@@ -10,16 +10,16 @@
#export DH_VERBOSE=1
-override_dh_auto_build:
- if [ ! -e setup.py ]; then sed -e "s/\@VERSION\@/$(shell dpkg-parsechangelog | grep Version: | cut -f2 -d' ' | cut -f1 -d- )/" -e 's/\@NAME\@/rhnlib/' setup.py.in > setup.py; fi
+override_dh_auto_configure:
+ if [ ! -e setup.py ]; then sed -e "s/\@VERSION\@/$(shell dpkg-parsechangelog | grep Version: | cut -f2 -d' ' | cut -f1 -d- )/" -e 's/\@NAME\@/rhn/' setup.py.in > setup.py; fi
if [ ! -e setup.cfg ]; then sed 's/\@RELEASE\@/$(shell dpkg-parsechangelog | grep Version: | cut -f2 -d' ' | cut -f2 -d- )/' setup.cfg.in > setup.cfg; fi
dh_auto_configure --buildsystem=python_distutils
clean:
- if [ -f setup.py ]; then dh --buildsystem=python_distutils $@; fi
+ if [ -f setup.py ]; then dh $@ --with python2 --buildsystem=python_distutils; fi
rm -f setup.py setup.cfg
rm -rf build
%:
- dh --buildsystem=python_distutils $@
+ dh $@ --with python2 --buildsystem python_distutils
commit 6c9eb4e179d07ac71e776a2a4a51c83cb432551b
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jun 15 18:04:38 2012 +0200
if python directory is rhn, then package must be python-rhn -- debian policy
diff --git a/client/debian/rhnlib/debian/control b/client/debian/rhnlib/debian/control
index 0849589..13b5ab6 100644
--- a/client/debian/rhnlib/debian/control
+++ b/client/debian/rhnlib/debian/control
@@ -7,7 +7,7 @@ Build-Depends: python (>= 2.6.6-3~), debhelper (>= 7.0.50~)
Standards-Version: 3.9.3
Homepage: https://fedorahosted.org/spacewalk
-Package: python-rhnlib
+Package: python-rhn
Architecture: all
Depends: ${python:Depends}, ${misc:Depends}, python-openssl
Description: Python libraries for the RHN project
commit 969ee99aaeeda7ba47b38f74ec0776c3ee56a13c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jun 15 18:03:24 2012 +0200
fix build deps
diff --git a/client/debian/rhnlib/debian/control b/client/debian/rhnlib/debian/control
index 34d163e..0849589 100644
--- a/client/debian/rhnlib/debian/control
+++ b/client/debian/rhnlib/debian/control
@@ -2,9 +2,9 @@ Source: rhnlib
Section: python
Priority: extra
Maintainer: Miroslav Suchý <miroslav(a)suchy.cz>
-Build-Depends: python, debhelper (>= 7.0.50~)
-Build-Depends-Indep: python-support (>= 0.8)
-Standards-Version: 3.9.1
+Uploaders: Bernd Zeimetz <bzed(a)debian.org>
+Build-Depends: python (>= 2.6.6-3~), debhelper (>= 7.0.50~)
+Standards-Version: 3.9.3
Homepage: https://fedorahosted.org/spacewalk
Package: python-rhnlib
commit dd1e40e023eebd9a12b6141e64e5945b5cc2c205
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jun 15 18:02:15 2012 +0200
when source tar.gz is rhnlib.tar.gz we have to name Source: rhnlib
diff --git a/client/debian/rhnlib/debian/control b/client/debian/rhnlib/debian/control
index 9af4c79..34d163e 100644
--- a/client/debian/rhnlib/debian/control
+++ b/client/debian/rhnlib/debian/control
@@ -1,4 +1,4 @@
-Source: python-rhnlib
+Source: rhnlib
Section: python
Priority: extra
Maintainer: Miroslav Suchý <miroslav(a)suchy.cz>
commit a3866d1dfa1f7f22ed0f492ad9a8279fe4a42d05
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jun 15 17:55:51 2012 +0200
update copyright information and add debian packaging license
diff --git a/client/debian/rhnlib/debian/copyright b/client/debian/rhnlib/debian/copyright
index 52c8c06..2d21ef7 100644
--- a/client/debian/rhnlib/debian/copyright
+++ b/client/debian/rhnlib/debian/copyright
@@ -1,11 +1,11 @@
-Rhnlib is copyright 2010 by Red Hat Inc.
+Rhnlib is copyright 2010-2012 by Red Hat Inc.
Rhnlib is currently developed by Spacewalk Development Team <spacewalk-devel(a)redhat.com>.
License: GPLv2
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License.
+ the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,3 +19,8 @@ License: GPLv2
See /usr/share/common-licenses/GPL-2, or
<http://www.gnu.org/copyleft/gpl.txt> for the terms of the latest version
of the GNU General Public License.
+
+The Debian packaging is
+ Copyright 2010-2012 by Red Hat Inc.
+ Copyright 2012 Bernd Zeimetz <bzed(a)debian.org>
+and licensed under the same license as rhnlib, see above.
commit 89480aeffda1b8ec519d7d7ce2f0280341849485
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jun 15 17:54:59 2012 +0200
update changelog
diff --git a/client/debian/rhnlib/debian/changelog b/client/debian/rhnlib/debian/changelog
index e8e9ee3..1c9aa21 100644
--- a/client/debian/rhnlib/debian/changelog
+++ b/client/debian/rhnlib/debian/changelog
@@ -1,6 +1,5 @@
-python-rhnlib (2.5.52-1) unstable; urgency=low
+rhnlib (2.5.52-1) unstable; urgency=low
- * Initial debian release
-
- -- Miroslav Suchy <miroslav(a)suchy.cz> Fri, 15 Jun 2012 17:43:13 +0200
+ * Initial release (Closes: #597490)
+ -- Bernd Zeimetz <bzed(a)debian.org> Fri, 15 Jun 2012 17:25:38 +0200
commit 1d3e1f85b9c7482a0b8bb201b9c194a7f97284bd
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jun 15 17:21:12 2012 +0200
update short summary
diff --git a/client/debian/rhnlib/debian/control b/client/debian/rhnlib/debian/control
index 9185a3a..9af4c79 100644
--- a/client/debian/rhnlib/debian/control
+++ b/client/debian/rhnlib/debian/control
@@ -10,7 +10,7 @@ Homepage: https://fedorahosted.org/spacewalk
Package: python-rhnlib
Architecture: all
Depends: ${python:Depends}, ${misc:Depends}, python-openssl
-Description: Collection of Python modules used by the Spacewalk software
+Description: Python libraries for the RHN project
Collection of base Python modules used by the Red Hat Network
(http://rhn.redhat.com) and Spacewalk software.
This is common library used by both clients and server.
commit 41dae9769939dc812cc9e4105110d12275ec980e
Author: Miroslav Suchy <msuchy(a)redhat.com>
Date: Fri Jun 15 17:18:28 2012 +0200
update debian changelog for rhnlib
diff --git a/client/debian/rhnlib/debian/changelog b/client/debian/rhnlib/debian/changelog
index a265c40..e8e9ee3 100644
--- a/client/debian/rhnlib/debian/changelog
+++ b/client/debian/rhnlib/debian/changelog
@@ -1,6 +1,6 @@
-python-rhnlib (2.5.40-1) unstable; urgency=low
+python-rhnlib (2.5.52-1) unstable; urgency=low
- * Rebased to upstream version
+ * Initial debian release
- -- Šimon Lukašík <xlukas08(a)stud.fit.vutbr.cz> Sat, 16 Apr 2011 17:43:13 +0200
+ -- Miroslav Suchy <miroslav(a)suchy.cz> Fri, 15 Jun 2012 17:43:13 +0200
commit e90390429a3b6d266179057c0c3c71aea6c1c2f9
Author: Miroslav Suchy <msuchy(a)redhat.com>
Date: Fri Jun 15 17:14:14 2012 +0200
python:Provides is depracated
diff --git a/client/debian/rhnlib/debian/control b/client/debian/rhnlib/debian/control
index 71f580c..9185a3a 100644
--- a/client/debian/rhnlib/debian/control
+++ b/client/debian/rhnlib/debian/control
@@ -10,7 +10,6 @@ Homepage: https://fedorahosted.org/spacewalk
Package: python-rhnlib
Architecture: all
Depends: ${python:Depends}, ${misc:Depends}, python-openssl
-Provides: ${python:Provides}, rhnlib
Description: Collection of Python modules used by the Spacewalk software
Collection of base Python modules used by the Red Hat Network
(http://rhn.redhat.com) and Spacewalk software.
commit ecbc94036abadad70ff2723302bc65ad72430b76
Author: Miroslav Suchy <msuchy(a)redhat.com>
Date: Fri Jun 15 17:08:50 2012 +0200
Changelog is not needed and copyright is not allowed
diff --git a/client/debian/rhnlib/debian/docs b/client/debian/rhnlib/debian/docs
index 70cfe37..724e084 100644
--- a/client/debian/rhnlib/debian/docs
+++ b/client/debian/rhnlib/debian/docs
@@ -1,4 +1,2 @@
-ChangeLog
-copyright
README
TODO
commit 8594a4127db1ca232e25622f9698ff233ab77f84
Author: Miroslav Suchy <msuchy(a)redhat.com>
Date: Fri Jun 15 17:14:43 2012 +0200
pycompat is depracated
diff --git a/client/debian/rhnlib/debian/pycompat b/client/debian/rhnlib/debian/pycompat
deleted file mode 100644
index 0cfbf08..0000000
--- a/client/debian/rhnlib/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2
11 years, 11 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 2 -
java/code/src/com/redhat/rhn/manager/system/VirtualizationEntitlementsManager.java | 15 ++++------
2 files changed, 7 insertions(+), 10 deletions(-)
New commits:
commit 601d654c90a312bcd1a8c599924f22b7026212ab
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jun 13 19:15:04 2012 +0200
822918 - impossible to get error code from PG exceptions
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
index 2ab6889..3c15485 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
@@ -997,7 +997,7 @@ GROUP BY C.id, C.name
</mode>
<callable-mode name="convert_to_flex">
- <query params="sid, cfid, uid">
+ <query params="sid, cfid">
{ call rhn_channel.convert_to_fve(:sid, :cfid) }
</query>
</callable-mode>
diff --git a/java/code/src/com/redhat/rhn/manager/system/VirtualizationEntitlementsManager.java b/java/code/src/com/redhat/rhn/manager/system/VirtualizationEntitlementsManager.java
index e902c0b..00b67a3 100644
--- a/java/code/src/com/redhat/rhn/manager/system/VirtualizationEntitlementsManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/VirtualizationEntitlementsManager.java
@@ -17,14 +17,12 @@ package com.redhat.rhn.manager.system;
import com.redhat.rhn.common.db.WrappedSQLException;
import com.redhat.rhn.common.db.datasource.CallableMode;
import com.redhat.rhn.common.db.datasource.ModeFactory;
-import com.redhat.rhn.domain.common.ExceptionMessage;
import com.redhat.rhn.domain.org.Org;
import com.redhat.rhn.domain.server.ServerFactory;
import com.redhat.rhn.domain.server.VirtualInstanceFactory;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.dto.ChannelFamilySystemGroup;
-import java.sql.SQLException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
@@ -160,14 +158,13 @@ public class VirtualizationEntitlementsManager {
toRet.add(sid);
}
catch (WrappedSQLException sq) {
- SQLException ex = (SQLException) sq.getCause();
- if (ex != null) {
- ExceptionMessage m = ExceptionMessage.lookup(ex.getErrorCode());
- if (m != null && "not_enough_flex_entitlements".equals(m.getLabel())) {
- break;
+ String msg = sq.getMessage();
+ if (msg != null) {
+ if (msg.contains("not_enough_flex_entitlements")) {
+ continue;
}
- if (m != null && "server_cannot_convert_to_flex".equals(m.getLabel())) {
- break;
+ if (msg.contains("server_cannot_convert_to_flex")) {
+ continue;
}
}
throw sq;
11 years, 11 months
Changes to 'refs/tags/spacewalk-backend-1.8.35-1'
by Michael Mraka
Tag 'spacewalk-backend-1.8.35-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-06-15 13:04 +0000
Tagging package [spacewalk-backend] version [1.8.35-1] in directory [backend/].
Changes since spacewalk-utils-1.8.20-1:
Michael Mraka (3):
removed unreachable code
fixed Instance of 'deb_Header' has no 'keys' member
Automatic commit of package [spacewalk-backend] release [1.8.35-1].
Milan Zazrivec (1):
separate schema upgrade script for PostgreSQL
Simon Lukasik (6):
Fix flawed SQL queries.
Move the listset definition out off the fragment.
Improve SCAP search: Return list of xccdf:TestResults-s
Add forgotten hidden form variable.
Setup {inSSM} variable on audit pages.
Add missing dollar sign.
---
backend/common/rhn_deb.py | 3
backend/server/importlib/userAuth.py | 6
backend/spacewalk-backend.spec | 6
java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml | 268 ++++++++++
java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java | 32 +
java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchHelper.java | 18
java/code/src/com/redhat/rhn/frontend/action/systems/audit/RuleDetailsAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/systems/audit/ScapSetupAction.java | 3
java/code/src/com/redhat/rhn/frontend/action/systems/audit/XccdfDetailsAction.java | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 9
java/code/src/com/redhat/rhn/manager/audit/ScapManager.java | 17
java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp | 9
java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp | 32 +
java/code/webapp/WEB-INF/pages/common/fragments/audit/xccdf-easy-list.jspf | 9
java/code/webapp/WEB-INF/struts-config.xml | 1
rel-eng/packages/spacewalk-backend | 2
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/104-suseCredentials_create.sql | 36 -
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/104-suseCredentials_create.sql.oracle | 36 +
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/104-suseCredentials_create.sql.postgresql | 35 +
19 files changed, 453 insertions(+), 73 deletions(-)
---
11 years, 11 months
3 commits - backend/common backend/server backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/common/rhn_deb.py | 3 +++
backend/server/importlib/userAuth.py | 6 ------
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
4 files changed, 9 insertions(+), 8 deletions(-)
New commits:
commit ab1a3968cd1333e323e79d2a5abc50c4e6f2fbd8
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jun 15 15:04:02 2012 +0200
Automatic commit of package [spacewalk-backend] release [1.8.35-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 8421645..b7ff9c2 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: 1.8.34
+Version: 1.8.35
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -663,6 +663,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Jun 15 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.35-1
+- fixed Instance of 'deb_Header' has no 'keys' member
+- removed unreachable code
+
* Tue Jun 12 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.34-1
- 804106 - do not entitle virt guests twice during registration
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 2ef1035..deb64f0 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.34-1 backend/
+1.8.35-1 backend/
commit 03902abd8f918e160378c1bc10bf60a2947a6eaa
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jun 14 10:31:55 2012 +0200
fixed Instance of 'deb_Header' has no 'keys' member
diff --git a/backend/common/rhn_deb.py b/backend/common/rhn_deb.py
index db2009a..a3b9ef0 100644
--- a/backend/common/rhn_deb.py
+++ b/backend/common/rhn_deb.py
@@ -86,6 +86,9 @@ class deb_Header:
def __getitem__(self, name):
return self.hdr.get(str(name))
+ def __getattr__(self, name):
+ return getattr(self.hdr, name)
+
class DEB_Package(A_Package):
def __init__(self, input_stream = None):
A_Package.__init__(self, input_stream)
commit e3f82f901e2e056208daf2552a3609ffb2c4ce33
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jun 15 15:00:35 2012 +0200
removed unreachable code
diff --git a/backend/server/importlib/userAuth.py b/backend/server/importlib/userAuth.py
index fecd877..2affccc 100644
--- a/backend/server/importlib/userAuth.py
+++ b/backend/server/importlib/userAuth.py
@@ -106,12 +106,6 @@ class UserAuth:
# Satellites are not allowwd to push in the null org
raise rhnFault(4,
_("You are not authorized to manage packages in the null org"))
- if not self.isSuperuser():
- # Nope
- raise rhnFault(4,
- _("You are not authorized to manage packages in the null org"))
-
- org_id = None
if org_id and self.org_id != org_id:
# Not so fast...
11 years, 11 months
java/code
by Šimon Lukašík
java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b9a25bfd54996d9c98048565a89e3904f9c0adea
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Fri Jun 15 12:23:40 2012 +0200
Add missing dollar sign.
diff --git a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
index fbb6910..8aa62f6 100644
--- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
@@ -137,7 +137,7 @@
<input type="hidden" name="search_string" value="${search_string}"/>
<input type="hidden" name="whereToSearch" value="${param.whereToSearch}"/>
<input type="hidden" name="show_as" value="${param.show_as}"/>
- <input type="hidden" name="result_filter" value="{param.result_filter}"/>
+ <input type="hidden" name="result_filter" value="${param.result_filter}"/>
<input type="hidden" name="optionScanDateSearch" value="${param.optionScanDateSearch}"/>
<input type="hidden" name="start_year" value="${param.start_year}"/>
<input type="hidden" name="start_month" value="${param.start_month}"/>
11 years, 11 months
schema/spacewalk
by Milan Zazrivec
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/104-suseCredentials_create.sql | 36 ----------
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/104-suseCredentials_create.sql.oracle | 36 ++++++++++
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/104-suseCredentials_create.sql.postgresql | 35 +++++++++
3 files changed, 71 insertions(+), 36 deletions(-)
New commits:
commit b95346fea2cbaacad54efe2289a1d7668bb3f63d
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Jun 15 13:49:50 2012 +0200
separate schema upgrade script for PostgreSQL
This is to avoid upgrade errors like:
psql:/var/log/spacewalk/schema-upgrade/20120615-005306-script.sql:1551: ERROR: syntax error at or near "ENABLE"
LINE 18: ENABLE ROW MOVEMENT
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/104-suseCredentials_create.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/104-suseCredentials_create.sql
deleted file mode 100644
index 9cad567..0000000
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/104-suseCredentials_create.sql
+++ /dev/null
@@ -1,36 +0,0 @@
---
--- Copyright (c) 2012 Novell
---
--- This software is licensed to you under the GNU General Public License,
--- version 2 (GPLv2). There is NO WARRANTY for this software, express or
--- implied, including the implied warranties of MERCHANTABILITY or FITNESS
--- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
--- along with this software; if not, see
--- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
---
--- Red Hat trademarks are not licensed under GPLv2. No permission is
--- granted to use or replicate Red Hat trademarks that are incorporated
--- in this software or its documentation.
---
-
-CREATE TABLE suseCredentials
-(
- id NUMBER NOT NULL
- CONSTRAINT suse_credentials_pk PRIMARY KEY,
- user_id NUMBER NOT NULL
- CONSTRAINT suse_credentials_user_fk
- REFERENCES web_contact (id)
- ON DELETE CASCADE,
- type_id NUMBER NOT NULL
- CONSTRAINT suse_credentials_type_fk
- REFERENCES suseCredentialsType (id),
- url VARCHAR2(256),
- username VARCHAR2(64) NOT NULL,
- password VARCHAR2(64) NOT NULL,
- created DATE DEFAULT (sysdate) NOT NULL,
- modified DATE DEFAULT (sysdate) NOT NULL
-)
-ENABLE ROW MOVEMENT
-;
-
-CREATE SEQUENCE suse_credentials_id_seq;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/104-suseCredentials_create.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/104-suseCredentials_create.sql.oracle
new file mode 100644
index 0000000..9cad567
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/104-suseCredentials_create.sql.oracle
@@ -0,0 +1,36 @@
+--
+-- Copyright (c) 2012 Novell
+--
+-- This software is licensed to you under the GNU General Public License,
+-- version 2 (GPLv2). There is NO WARRANTY for this software, express or
+-- implied, including the implied warranties of MERCHANTABILITY or FITNESS
+-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+-- along with this software; if not, see
+-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+--
+-- Red Hat trademarks are not licensed under GPLv2. No permission is
+-- granted to use or replicate Red Hat trademarks that are incorporated
+-- in this software or its documentation.
+--
+
+CREATE TABLE suseCredentials
+(
+ id NUMBER NOT NULL
+ CONSTRAINT suse_credentials_pk PRIMARY KEY,
+ user_id NUMBER NOT NULL
+ CONSTRAINT suse_credentials_user_fk
+ REFERENCES web_contact (id)
+ ON DELETE CASCADE,
+ type_id NUMBER NOT NULL
+ CONSTRAINT suse_credentials_type_fk
+ REFERENCES suseCredentialsType (id),
+ url VARCHAR2(256),
+ username VARCHAR2(64) NOT NULL,
+ password VARCHAR2(64) NOT NULL,
+ created DATE DEFAULT (sysdate) NOT NULL,
+ modified DATE DEFAULT (sysdate) NOT NULL
+)
+ENABLE ROW MOVEMENT
+;
+
+CREATE SEQUENCE suse_credentials_id_seq;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/104-suseCredentials_create.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/104-suseCredentials_create.sql.postgresql
new file mode 100644
index 0000000..4845d15
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/104-suseCredentials_create.sql.postgresql
@@ -0,0 +1,35 @@
+-- oracle equivalent source sha1 be0097f70c2d4700e7533fdcc543dcbd3c3a181f
+-- Copyright (c) 2012 Novell
+--
+-- This software is licensed to you under the GNU General Public License,
+-- version 2 (GPLv2). There is NO WARRANTY for this software, express or
+-- implied, including the implied warranties of MERCHANTABILITY or FITNESS
+-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+-- along with this software; if not, see
+-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+--
+-- Red Hat trademarks are not licensed under GPLv2. No permission is
+-- granted to use or replicate Red Hat trademarks that are incorporated
+-- in this software or its documentation.
+--
+
+CREATE TABLE suseCredentials
+(
+ id NUMBER NOT NULL
+ CONSTRAINT suse_credentials_pk PRIMARY KEY,
+ user_id NUMBER NOT NULL
+ CONSTRAINT suse_credentials_user_fk
+ REFERENCES web_contact (id)
+ ON DELETE CASCADE,
+ type_id NUMBER NOT NULL
+ CONSTRAINT suse_credentials_type_fk
+ REFERENCES suseCredentialsType (id),
+ url VARCHAR2(256),
+ username VARCHAR2(64) NOT NULL,
+ password VARCHAR2(64) NOT NULL,
+ created DATE DEFAULT (sysdate) NOT NULL,
+ modified DATE DEFAULT (sysdate) NOT NULL
+)
+;
+
+CREATE SEQUENCE suse_credentials_id_seq;
11 years, 11 months
5 commits - java/code
by Šimon Lukašík
java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml | 268 ++++++++++
java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java | 32 +
java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchHelper.java | 18
java/code/src/com/redhat/rhn/frontend/action/systems/audit/RuleDetailsAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/systems/audit/ScapSetupAction.java | 3
java/code/src/com/redhat/rhn/frontend/action/systems/audit/XccdfDetailsAction.java | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 9
java/code/src/com/redhat/rhn/manager/audit/ScapManager.java | 17
java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp | 9
java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp | 32 +
java/code/webapp/WEB-INF/pages/common/fragments/audit/xccdf-easy-list.jspf | 9
java/code/webapp/WEB-INF/struts-config.xml | 1
12 files changed, 373 insertions(+), 29 deletions(-)
New commits:
commit cf9d299c2bb529c02cea3096b4f4b648d733919a
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu Jun 14 12:04:54 2012 +0200
Setup {inSSM} variable on audit pages.
Do not show 'add to ssm' link for system that is already in.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/audit/RuleDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/audit/RuleDetailsAction.java
index ff36b53..0f6ee95 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/audit/RuleDetailsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/audit/RuleDetailsAction.java
@@ -25,6 +25,7 @@ import org.apache.struts.action.ActionMapping;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.action.systems.sdc.SdcHelper;
import com.redhat.rhn.frontend.dto.XccdfRuleResultDto;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
@@ -63,6 +64,7 @@ public class RuleDetailsAction extends RhnAction implements Listable {
request.setAttribute(ListTagHelper.PARENT_URL,
request.getRequestURI() + "?sid=" + sid + "&rrid=" + ruleResultId);
+ SdcHelper.ssmCheck(request, sid, user);
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/audit/ScapSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/audit/ScapSetupAction.java
index 31fb82c..263706a 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/audit/ScapSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/audit/ScapSetupAction.java
@@ -16,6 +16,7 @@ package com.redhat.rhn.frontend.action.systems.audit;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.action.systems.sdc.SdcHelper;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.manager.audit.ScapManager;
@@ -36,5 +37,7 @@ public abstract class ScapSetupAction extends RhnAction {
boolean enabled = ScapManager.isScapEnabled(server, user);
context.getRequest().setAttribute(SCAP_ENABLED, enabled);
context.getRequest().setAttribute(REQUIRED_PKG, SPACEWALK_OSCAP);
+
+ SdcHelper.ssmCheck(context.getRequest(), server.getId(), user);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/audit/XccdfDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/audit/XccdfDetailsAction.java
index 7475768..35618c0 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/audit/XccdfDetailsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/audit/XccdfDetailsAction.java
@@ -27,6 +27,7 @@ import com.redhat.rhn.domain.audit.ScapFactory;
import com.redhat.rhn.domain.audit.XccdfTestResult;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.action.systems.sdc.SdcHelper;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.frontend.struts.RhnHelper;
@@ -64,6 +65,7 @@ public class XccdfDetailsAction extends RhnAction implements Listable {
request.setAttribute(ListTagHelper.PARENT_URL,
request.getRequestURI() + "?sid=" + sid + "&xid=" + xid);
+ SdcHelper.ssmCheck(request, sid, user);
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
commit ec2bc0832ce4e7d2586f98c15bd9764fea6df1e7
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu Jun 14 11:40:40 2012 +0200
Add forgotten hidden form variable.
diff --git a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
index 8065091..fbb6910 100644
--- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
@@ -137,6 +137,7 @@
<input type="hidden" name="search_string" value="${search_string}"/>
<input type="hidden" name="whereToSearch" value="${param.whereToSearch}"/>
<input type="hidden" name="show_as" value="${param.show_as}"/>
+ <input type="hidden" name="result_filter" value="{param.result_filter}"/>
<input type="hidden" name="optionScanDateSearch" value="${param.optionScanDateSearch}"/>
<input type="hidden" name="start_year" value="${param.start_year}"/>
<input type="hidden" name="start_month" value="${param.start_month}"/>
commit cd01241e2832fc4749c5912573a9db82cd092096
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Wed Jun 13 09:38:44 2012 +0200
Improve SCAP search: Return list of xccdf:TestResults-s
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml
index 13d9459..53a9a35 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml
@@ -295,6 +295,270 @@
</query>
</mode>
+<mode name="tr_by_idents" class="com.redhat.rhn.frontend.dto.XccdfTestResultDto">
+ <elaborator name="testresult_counts"/>
+ <query params="user_id">
+ SELECT DISTINCT tr.id AS xid,
+ xp.identifier AS profile,
+ tr.server_id as sid,
+ s.name as server_name,
+ sa.completion_time AS completed
+ FROM rhnXccdfRuleresult rr,
+ rhnXccdfRuleIdentMap rim,
+ rhnXccdfTestresult tr,
+ rhnUserServerPerms usp,
+ rhnXccdfProfile xp,
+ rhnServer s,
+ rhnActionScap ras,
+ rhnServerAction sa
+ WHERE rim.ident_id IN (%s)
+ AND rim.rresult_id = rr.id
+ AND tr.id = rr.testresult_id
+ AND tr.server_id = usp.server_id
+ AND usp.user_id = :user_id
+ AND tr.profile_id = xp.id
+ AND tr.server_id = s.id
+ AND tr.action_scap_id = ras.id
+ AND sa.action_id = ras.action_id
+ AND tr.server_id = sa.server_id
+ ORDER BY tr.id DESC
+ </query>
+</mode>
+
+<mode name="tr_by_idents_slabel" class="com.redhat.rhn.frontend.dto.XccdfTestResultDto">
+ <elaborator name="testresult_counts"/>
+ <query params="user_id, slabel">
+ SELECT DISTINCT tr.id AS xid,
+ xp.identifier AS profile,
+ tr.server_id as sid,
+ s.name as server_name,
+ sa.completion_time AS completed
+ FROM rhnXccdfRuleresult rr,
+ rhnXccdfRuleIdentMap rim,
+ rhnXccdfTestResult tr,
+ rhnSet st,
+ rhnXccdfProfile xp,
+ rhnServer s,
+ rhnActionScap ras,
+ rhnServerAction sa
+ WHERE rim.ident_id IN (%s)
+ AND rim.rresult_id = rr.id
+ AND tr.id = testresult_id
+ AND tr.server_id = st.element
+ AND st.user_id = :user_id
+ AND st.label = :slabel
+ AND tr.profile_id = xp.id
+ AND tr.server_id = s.id
+ AND tr.action_scap_id = ras.id
+ AND tr.server_id = sa.server_id
+ AND sa.action_id = ras.action_id
+ ORDER BY tr.id DESC
+ </query>
+</mode>
+
+<mode name="tr_by_idents_start_end" class="com.redhat.rhn.frontend.dto.XccdfTestResultDto">
+ <elaborator name="testresult_counts"/>
+ <query params="user_id, start, end">
+ SELECT DISTINCT tr.id AS xid,
+ xp.identifier AS profile,
+ tr.server_id as sid,
+ s.name as server_name,
+ sa.completion_time AS completed
+ FROM rhnXccdfRuleresult rr,
+ rhnXccdfRuleIdentMap rim,
+ rhnXccdfTestresult tr,
+ rhnUserServerPerms usp,
+ rhnActionScap ras,
+ rhnServerAction sa,
+ rhnXccdfProfile xp,
+ rhnServer s
+ WHERE rim.ident_id IN (%s)
+ AND rim.rresult_id = rr.id
+ AND tr.id = rr.testresult_id
+ AND tr.server_id = usp.server_id
+ AND usp.user_id = :user_id
+ AND tr.profile_id = xp.id
+ AND tr.server_id = s.id
+ AND tr.action_scap_id = ras.id
+ AND tr.server_id = sa.server_id
+ AND sa.action_id = ras.action_id
+ AND sa.completion_time >= :start
+ AND sa.completion_time <= :end
+ ORDER BY tr.id DESC
+ </query>
+</mode>
+
+<mode name="tr_by_idents_slabel_start_end" class="com.redhat.rhn.frontend.dto.XccdfTestResultDto">
+ <elaborator name="testresult_counts"/>
+ <query params="user_id, slabel, start, end">
+ SELECT DISTINCT tr.id AS xid,
+ xp.identifier AS profile,
+ tr.server_id as sid,
+ s.name as server_name,
+ sa.completion_time AS completed
+ FROM rhnXccdfRuleresult rr,
+ rhnXccdfRuleIdentMap rim,
+ rhnXccdfTestResult tr,
+ rhnSet st,
+ rhnActionScap ras,
+ rhnServerAction sa,
+ rhnXccdfProfile xp,
+ rhnServer s
+ WHERE rim.ident_id IN (%s)
+ AND rim.rresult_id = rr.id
+ AND tr.id = testresult_id
+ AND tr.server_id = st.element
+ AND st.user_id = :user_id
+ AND st.label = :slabel
+ AND tr.profile_id = xp.id
+ AND tr.server_id = s.id
+ AND tr.action_scap_id = ras.id
+ AND tr.server_id = sa.server_id
+ AND sa.action_id = ras.action_id
+ AND sa.completion_time >= :start
+ AND sa.completion_time <= :end
+ ORDER BY tr.id DESC
+ </query>
+</mode>
+
+<mode name="tr_by_idents_result" class="com.redhat.rhn.frontend.dto.XccdfTestResultDto">
+ <elaborator name="testresult_counts"/>
+ <query params="user_id, result">
+ SELECT DISTINCT tr.id AS xid,
+ xp.identifier AS profile,
+ tr.server_id as sid,
+ s.name as server_name,
+ sa.completion_time AS completed
+ FROM rhnXccdfRuleresult rr,
+ rhnXccdfRuleresultType rrt,
+ rhnXccdfRuleIdentMap rim,
+ rhnXccdfTestresult tr,
+ rhnUserServerPerms usp,
+ rhnActionScap ras,
+ rhnServerAction sa,
+ rhnXccdfProfile xp,
+ rhnServer s
+ WHERE rim.ident_id IN (%s)
+ AND rim.rresult_id = rr.id
+ AND rr.result_id = rrt.id
+ AND tr.id = rr.testresult_id
+ AND tr.server_id = usp.server_id
+ AND usp.user_id = :user_id
+ AND tr.profile_id = xp.id
+ AND tr.server_id = s.id
+ AND tr.action_scap_id = ras.id
+ AND tr.server_id = sa.server_id
+ AND sa.action_id = ras.action_id
+ AND rrt.label = :result
+ ORDER BY tr.id DESC
+ </query>
+</mode>
+
+<mode name="tr_by_idents_slabel_result" class="com.redhat.rhn.frontend.dto.XccdfTestResultDto">
+ <elaborator name="testresult_counts"/>
+ <query params="user_id, slabel, result">
+ SELECT DISTINCT tr.id AS xid,
+ xp.identifier AS profile,
+ tr.server_id as sid,
+ s.name as server_name,
+ sa.completion_time AS completed
+ FROM rhnXccdfRuleresult rr,
+ rhnXccdfRuleresultType rrt,
+ rhnXccdfRuleIdentMap rim,
+ rhnXccdfTestResult tr,
+ rhnSet st,
+ rhnActionScap ras,
+ rhnServerAction sa,
+ rhnXccdfProfile xp,
+ rhnServer s
+ WHERE rim.ident_id IN (%s)
+ AND rim.rresult_id = rr.id
+ AND rr.result_id = rrt.id
+ AND tr.id = testresult_id
+ AND tr.server_id = st.element
+ AND st.user_id = :user_id
+ AND st.label = :slabel
+ AND tr.profile_id = xp.id
+ AND tr.server_id = s.id
+ AND tr.action_scap_id = ras.id
+ AND tr.server_id = sa.server_id
+ AND sa.action_id = ras.action_id
+ AND rrt.label = :result
+ ORDER BY tr.id DESC
+ </query>
+</mode>
+
+<mode name="tr_by_idents_start_end_result" class="com.redhat.rhn.frontend.dto.XccdfTestResultDto">
+ <elaborator name="testresult_counts"/>
+ <query params="user_id, start, end, result">
+ SELECT DISTINCT tr.id AS xid,
+ xp.identifier AS profile,
+ tr.server_id as sid,
+ s.name as server_name,
+ sa.completion_time AS completed
+ FROM rhnXccdfRuleresult rr,
+ rhnXccdfRuleresultType rrt,
+ rhnXccdfRuleIdentMap rim,
+ rhnXccdfTestresult tr,
+ rhnUserServerPerms usp,
+ rhnActionScap ras,
+ rhnServerAction sa,
+ rhnXccdfProfile xp,
+ rhnServer s
+ WHERE rim.ident_id IN (%s)
+ AND rim.rresult_id = rr.id
+ AND rr.result_id = rrt.id
+ AND tr.id = rr.testresult_id
+ AND tr.server_id = usp.server_id
+ AND usp.user_id = :user_id
+ AND tr.profile_id = xp.id
+ AND tr.server_id = s.id
+ AND tr.action_scap_id = ras.id
+ AND tr.server_id = sa.server_id
+ AND sa.action_id = ras.action_id
+ AND sa.completion_time >= :start
+ AND sa.completion_time <= :end
+ AND rrt.label = :result
+ ORDER BY tr.id DESC
+ </query>
+</mode>
+
+<mode name="tr_by_idents_slabel_start_end_result" class="com.redhat.rhn.frontend.dto.XccdfTestResultDto">
+ <elaborator name="testresult_counts"/>
+ <query params="user_id, slabel, start, end, result">
+ SELECT DISTINCT tr.id AS xid,
+ xp.identifier AS profile,
+ tr.server_id as sid,
+ s.name as server_name,
+ sa.completion_time AS completed
+ FROM rhnXccdfRuleresult rr,
+ rhnXccdfRuleresultType rrt,
+ rhnXccdfRuleIdentMap rim,
+ rhnXccdfTestResult tr,
+ rhnSet st,
+ rhnActionScap ras,
+ rhnServerAction sa,
+ rhnXccdfProfile xp,
+ rhnServer s
+ WHERE rim.ident_id IN (%s)
+ AND rim.rresult_id = rr.id
+ AND rr.result_id = rrt.id
+ AND tr.id = testresult_id
+ AND tr.server_id = st.element
+ AND st.user_id = :user_id
+ AND st.label = :slabel
+ AND tr.profile_id = xp.id
+ AND tr.server_id = s.id
+ AND tr.action_scap_id = ras.id
+ AND tr.server_id = sa.server_id
+ AND sa.action_id = ras.action_id
+ AND sa.completion_time >= :start
+ AND sa.completion_time <= :end
+ AND rrt.label = :result
+ ORDER BY tr.id DESC
+ </query>
+</mode>
+
<mode name="idents_per_ruleresult" class="com.redhat.rhn.frontend.dto.XccdfIdentDto">
<query params="rr_id">
SELECT xi.id, xi.identifier, xis.system
diff --git a/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java b/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java
index 7fd0410..9c09ce7 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java
@@ -39,12 +39,14 @@ import org.directwebremoting.util.Logger;
import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcFault;
+import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.common.util.DatePicker;
import com.redhat.rhn.frontend.action.common.DateRangePicker;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
+import com.redhat.rhn.frontend.taglibs.list.TagHelper;
import com.redhat.rhn.manager.audit.ScapManager;
/**
@@ -56,6 +58,9 @@ public class XccdfSearchAction extends RhnAction {
private static final String WHERE_TO_SEARCH = "whereToSearch";
private static final String SCAN_DATE_SEARCH = "optionScanDateSearch";
private static final String ANY_LABEL = "any";
+ private static final String SHOW_AS = "show_as";
+ private static final String TESTRESULT_ID = "tr";
+ private static final String RULERESULT_ID = "rr";
private static Logger log = Logger.getLogger(XccdfSearchAction.class);
/** {@inheritDoc} */
@@ -129,15 +134,21 @@ public class XccdfSearchAction extends RhnAction {
form.set(WHERE_TO_SEARCH,
"system_list".equals(whereToSearch) ? whereToSearch : "all");
setupRuleResultLabelOptions(request);
+ setupShowAsOption(form);
DateRangePicker picker = setupDatePicker(form, request);
if (!StringUtils.isBlank(searchString)) {
picker.processDatePickers(getOptionScanDateSearch(request), false);
- List results = XccdfSearchHelper.performSearch(searchString, whereToSearch,
- getPickerDate(request, "start"), getPickerDate(request, "end"),
- getRuleResultLabel(form), context);
+ DataResult results = XccdfSearchHelper.performSearch(searchString,
+ whereToSearch, getPickerDate(request, "start"),
+ getPickerDate(request, "end"), getRuleResultLabel(form),
+ isTestestResultRequested(form), context);
request.setAttribute(RequestContext.PAGE_LIST,
results != null ? results : Collections.EMPTY_LIST);
+ if (isTestestResultRequested(form) && results != null) {
+ TagHelper.bindElaboratorTo("searchResults", results.getElaborator(),
+ request);
+ }
}
else {
request.setAttribute(RequestContext.PAGE_LIST, Collections.EMPTY_LIST);
@@ -186,6 +197,21 @@ public class XccdfSearchAction extends RhnAction {
"scapsearch.jsp.end_date");
}
+ private boolean isTestestResultRequested(DynaActionForm form) {
+ String showAs = form.getString(SHOW_AS);
+ if (showAs == null ||
+ RULERESULT_ID.equals(showAs) || "".equals(showAs)) {
+ return false;
+ }
+ return true;
+ }
+
+ private void setupShowAsOption(DynaActionForm form) {
+ String showAs = form.getString(SHOW_AS);
+ form.set(SHOW_AS,
+ TESTRESULT_ID.equals(showAs) ? showAs : RULERESULT_ID);
+ }
+
private String getRuleResultLabel(DynaActionForm form) {
String resultFilter = form.getString("result_filter");
if (resultFilter == null ||
diff --git a/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchHelper.java b/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchHelper.java
index 53dad98..a13dff6 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchHelper.java
@@ -27,6 +27,7 @@ import redstone.xmlrpc.XmlRpcException;
import redstone.xmlrpc.XmlRpcFault;
import com.redhat.rhn.common.conf.ConfigDefaults;
+import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.manager.audit.ScapManager;
@@ -44,17 +45,20 @@ public class XccdfSearchHelper extends RhnAction {
* Perform search over XCCDF
* @param searchString A string to search within xccdf:Rules
* @param whereToSearch Where to search for scans, either ssm or all machines
- * @param startDate search scans performed after startDate (null to ommit)
- * @param endDate search scans performed before endDate (null to ommit)
- * @param ruleResult search rules with given ruleresult label (null to ommit)
- * @param context A context of cuyrrent request
+ * @param startDate search scans performed after startDate (null to omit)
+ * @param endDate search scans performed before endDate (null to omit)
+ * @param ruleResult search rules with given ruleresult label (null to omit)
+ * @param returnTestResults return results as list of TestResult (true),
+ * or RuleResults (false)
+ * @param context A context of current request
* @return a list of xccdf:rule-results
* @throws MalformedURLException possibly bad configuration for search server address
* @throws XmlRpcException in the case of a serialization failure
* @throws XmlRpcFault bad communication with search server
*/
- public static List performSearch(String searchString, String whereToSearch,
- Date startDate, Date endDate, String ruleResult, RequestContext context)
+ public static DataResult performSearch(String searchString, String whereToSearch,
+ Date startDate, Date endDate, String ruleResult, boolean returnTestResults,
+ RequestContext context)
throws MalformedURLException, XmlRpcException, XmlRpcFault {
ArrayList args = new ArrayList();
args.add(context.getWebSession().getId());
@@ -83,7 +87,7 @@ public class XccdfSearchHelper extends RhnAction {
if (ruleResult != null) {
params.put("result", ruleResult);
}
- return ScapManager.ruleResultsByIdentIds(params, identIds);
+ return ScapManager.searchByIdentIds(params, identIds, returnTestResults);
}
private static String preprocessSearchString(String searchString) {
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 1fb8e89..8c8a3a7 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -12157,6 +12157,15 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro
<trans-unit id="scapsearch.jsp.end_date">
<source>End Date</source>
</trans-unit>
+ <trans-unit id="scapsearch.jsp.show_as">
+ <source>Show Search Result As</source>
+ </trans-unit>
+ <trans-unit id="scapsearch.jsp.list_rr">
+ <source>List of XCCDF Rule Results</source>
+ </trans-unit>
+ <trans-unit id="scapsearch.jsp.list_tr">
+ <source>List of XCCDF Scans</source>
+ </trans-unit>
</group>
<!-- Action common -->
diff --git a/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java b/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java
index dbe8120..3c71e14 100644
--- a/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java
+++ b/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java
@@ -134,22 +134,29 @@ public class ScapManager extends BaseManager {
}
/**
- * Get xccdf:rule-results by ident's ids
+ * Get xccdf:rule-result-s or xccdf:TestResult-s by ident's ids
* @param inParams direct parameters for query.
* user_id is the only compulsory
* @param identIds list of xccdf:ident ids
+ * @param returnTestResults what to return
+ * (true - list of testresults, false - list of rule-results)
* @return the result
*/
- public static List<XccdfRuleResultDto> ruleResultsByIdentIds(Map inParams,
- List<Long> identIds) {
- String modeName = "rr_by_idents";
+ public static DataResult searchByIdentIds(Map inParams,
+ List<Long> identIds, boolean returnTestResults) {
+ String modeName = (returnTestResults ? "t" : "r") + "r_by_idents";
for (String term : SEARCH_TERM_PRECEDENCE) {
if (inParams.containsKey(term)) {
modeName += "_" + term;
}
}
SelectMode m = ModeFactory.getMode("scap_queries", modeName);
- return m.execute(inParams, identIds);
+ DataResult dr = m.execute(inParams, identIds);
+ if (returnTestResults) {
+ dr.setTotalSize(dr.size());
+ dr = processPageControl(dr, null, new HashMap());
+ }
+ return dr;
}
/**
diff --git a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
index aa42a0e..8065091 100644
--- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
@@ -93,6 +93,18 @@
</div>
</td>
</tr>
+ <tr><th><bean:message key="scapsearch.jsp.show_as"/>:</th>
+ <td>
+ <div style="text-align: left">
+ <html:radio property="show_as" value="rr" styleId="show_as-rr"/>
+ <label for="show_as-rr"><bean:message key="scapsearch.jsp.list_rr"/></label>
+ </div>
+ <div style="text-align: left">
+ <html:radio property="show_as" value="tr" styleId="show_as-tr"/>
+ <label for="show_as-tr"><bean:message key="scapsearch.jsp.list_tr"/></label>
+ </div>
+ </td>
+ </tr>
</table>
</div> <!-- search-choices-group -->
</div> <!-- search-choices -->
@@ -105,15 +117,26 @@
<rl:listset name="searchSet" legend="xccdf">
<rhn:csrf/>
- <rl:list emptykey="generic.jsp.none" name="searchResults" dataset="pageList">
- <rl:decorator name="PageSizeDecorator"/>
- <%@ include file="/WEB-INF/pages/common/fragments/audit/rule-common-columns.jspf" %>
- </rl:list>
+ <c:choose>
+ <c:when test="${param.show_as == 'tr'}">
+ <rl:list emptykey="generic.jsp.none" name="searchResults" dataset="pageList">
+ <%@ include file="/WEB-INF/pages/common/fragments/audit/xccdf-easy-list.jspf" %>
+ </rl:list>
+ </c:when>
+
+ <c:otherwise>
+ <rl:list emptykey="generic.jsp.none" name="searchResults" dataset="pageList">
+ <rl:decorator name="PageSizeDecorator"/>
+ <%@ include file="/WEB-INF/pages/common/fragments/audit/rule-common-columns.jspf" %>
+ </rl:list>
+ </c:otherwise>
+ </c:choose>
<!-- there are two forms here, need to keep the formvars around for pagination -->
<input type="hidden" name="submitted" value="true"/>
<input type="hidden" name="search_string" value="${search_string}"/>
<input type="hidden" name="whereToSearch" value="${param.whereToSearch}"/>
+ <input type="hidden" name="show_as" value="${param.show_as}"/>
<input type="hidden" name="optionScanDateSearch" value="${param.optionScanDateSearch}"/>
<input type="hidden" name="start_year" value="${param.start_year}"/>
<input type="hidden" name="start_month" value="${param.start_month}"/>
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index 5002670..bab6c1d 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -239,6 +239,7 @@
<form-property name="whereToSearch" type="java.lang.String"/>
<form-property name="submitted" type="java.lang.Boolean" />
<form-property name="result_filter" type="java.lang.String"/>
+ <form-property name="show_as" type="java.lang.String"/>
<form-property name="optionScanDateSearch" type="java.lang.Boolean" />
<form-property name="start_year" type="java.lang.Integer"/>
<form-property name="start_month" type="java.lang.Integer"/>
commit 9395a74f2fe2e4bcce2db4dca508501c2647d570
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Wed Jun 13 12:58:19 2012 +0200
Move the listset definition out off the fragment.
diff --git a/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp b/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp
index b57d55b..30ce4c8 100644
--- a/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp
@@ -17,7 +17,14 @@
<bean:message key="system.audit.listscap.jsp.overview"/>
</rhn:toolbar>
-<%@ include file="/WEB-INF/pages/common/fragments/audit/xccdf-easy-list.jspf" %>
+<rl:listset name="groupSet" legend="xccdf">
+ <rhn:csrf />
+ <rhn:submitted />
+ <rl:list emptykey="audit.listxccdf.jsp.noscans">
+ <%@ include file="/WEB-INF/pages/common/fragments/audit/xccdf-easy-list.jspf" %>
+ </rl:list>
+ <rhn:tooltip key="audit.listxccdf.jsp.tooltip"/>
+</rl:listset>
</body>
</html>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/audit/xccdf-easy-list.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/audit/xccdf-easy-list.jspf
index d824c70..6d2bd37 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/audit/xccdf-easy-list.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/audit/xccdf-easy-list.jspf
@@ -1,8 +1,3 @@
-<rl:listset name="groupSet" legend="xccdf">
- <rhn:csrf />
- <rhn:submitted />
-
- <rl:list emptykey="audit.listxccdf.jsp.noscans">
<rl:decorator name="ElaborationDecorator"/>
<rl:decorator name="PageSizeDecorator"/>
@@ -33,7 +28,3 @@
<rl:column headerkey="audit.listxccdf.jsp.satisfactionunknown">
<c:out value="${current.satisfactionUnknown}"/>
</rl:column>
- </rl:list>
-</rl:listset>
-
-<rhn:tooltip key="audit.listxccdf.jsp.tooltip"/>
commit cfb3422440554a7700c29735bede25b37b28b156
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Wed Jun 13 13:21:20 2012 +0200
Fix flawed SQL queries.
When searching for rule-results within given dates,
correct server_id needs to be bind. Otherwise, query
can return more results than expected.
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml
index e51fa27..13d9459 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml
@@ -170,6 +170,7 @@
AND usp.user_id = :user_id
AND tr.action_scap_id = ras.id
AND sa.action_id = ras.action_id
+ AND sa.server_id = tr.server_id
AND sa.completion_time >= :start
AND sa.completion_time <= :end
ORDER BY rr.id DESC
@@ -195,6 +196,7 @@
AND st.label = :slabel
AND tr.action_scap_id = ras.id
AND sa.action_id = ras.action_id
+ AND sa.server_id = tr.server_id
AND sa.completion_time >= :start
AND sa.completion_time <= :end
ORDER BY rr.id DESC
@@ -258,6 +260,7 @@
AND usp.user_id = :user_id
AND tr.action_scap_id = ras.id
AND sa.action_id = ras.action_id
+ AND sa.server_id = tr.server_id
AND sa.completion_time >= :start
AND sa.completion_time <= :end
AND rrt.label = :result
@@ -284,6 +287,7 @@
AND st.label = :slabel
AND tr.action_scap_id = ras.id
AND sa.action_id = ras.action_id
+ AND sa.server_id = tr.server_id
AND sa.completion_time >= :start
AND sa.completion_time <= :end
AND rrt.label = :result
11 years, 11 months
Changes to 'refs/tags/spacewalk-utils-1.8.20-1'
by Michael Mraka
Tag 'spacewalk-utils-1.8.20-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-06-14 12:20 +0000
Tagging package [spacewalk-utils] version [1.8.20-1] in directory [utils/].
Changes since spacewalk-proxy-1.8.6-1:
Michael Mraka (2):
system.list_user_systems() now returns localtime
Automatic commit of package [spacewalk-utils] release [1.8.20-1].
---
rel-eng/packages/spacewalk-utils | 2 +-
utils/delete-old-systems-interactive | 4 ++--
utils/spacewalk-utils.spec | 5 ++++-
3 files changed, 7 insertions(+), 4 deletions(-)
---
11 years, 11 months
2 commits - rel-eng/packages utils/delete-old-systems-interactive utils/spacewalk-utils.spec
by Michael Mraka
rel-eng/packages/spacewalk-utils | 2 +-
utils/delete-old-systems-interactive | 4 ++--
utils/spacewalk-utils.spec | 5 ++++-
3 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit b0b5456f59f1f1322fddf2b93cbe0cbb879c7155
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jun 14 14:20:25 2012 +0200
Automatic commit of package [spacewalk-utils] release [1.8.20-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index b01bb3d..8ea3623 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-1.8.19-1 utils/
+1.8.20-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index bd90d82..215ec05 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -1,7 +1,7 @@
%define rhnroot %{_prefix}/share/rhn
Name: spacewalk-utils
-Version: 1.8.19
+Version: 1.8.20
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -86,6 +86,9 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot}
%changelog
+* Thu Jun 14 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.20-1
+- system.list_user_systems() now returns localtime
+
* Thu Jun 07 2012 Stephen Herr <sherr(a)redhat.com> 1.8.19-1
- 829485 - fixed type
commit babadbfbc3036036a389788f311eaf38d8baf9ee
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jun 14 11:44:59 2012 +0200
system.list_user_systems() now returns localtime
diff --git a/utils/delete-old-systems-interactive b/utils/delete-old-systems-interactive
index 83dafc4..f242ee2 100755
--- a/utils/delete-old-systems-interactive
+++ b/utils/delete-old-systems-interactive
@@ -47,10 +47,10 @@ else {
}
my $not_before = time - $idle_time;
-my ($sec, $min, $h, $d, $m, $y) = gmtime($not_before);
+my ($sec, $min, $h, $d, $m, $y) = localtime($not_before);
my $cutoff = sprintf '%04d%02d%02dT%02d:%02d:%02d',
$y + 1900,$m + 1, $d, $h, $min, $sec;
-print "Lookup on [$host] systems with last checkin before [$cutoff] GMT\n";
+print "Lookup on [$host] systems with last checkin before [$cutoff]\n";
my $client = new Frontier::Client(url => "http://$host/rpc/api", debug=>0);
my $session = $client->call('auth.login', $username, $passwd)
11 years, 11 months
Changes to 'refs/tags/spacewalk-proxy-1.8.6-1'
by Michael Mraka
Tag 'spacewalk-proxy-1.8.6-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-06-14 09:44 +0000
Tagging package [spacewalk-proxy] version [1.8.6-1] in directory [proxy/proxy/].
Changes since spacewalk-proxy-1.8.5-1:
Michael Mraka (3):
merged uploadLib.UploadClass into rhn_package_manager.UploadClass
no more special uploadLib.py
Automatic commit of package [spacewalk-proxy] release [1.8.6-1].
---
proxy/proxy/pm/Makefile | 2 -
proxy/proxy/pm/rhn_package_manager.py | 30 ++++++++++++++++++--
proxy/proxy/pm/uploadLib.py | 50 ----------------------------------
proxy/proxy/spacewalk-proxy.spec | 7 +++-
rel-eng/packages/spacewalk-proxy | 2 -
5 files changed, 34 insertions(+), 57 deletions(-)
---
11 years, 11 months