Branch 'VADER' - selinux/spacewalk-monitoring-selinux
by Jan Pazdziora
selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 36a6b27d2071c0ab1bb87ecd0b00c00e130841b6
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Aug 10 17:00:15 2009 +0200
516073 - allow monitoring to setpgid self.
Addressing:
type=AVC msg=audit(1249571377.161:25): avc: denied { setpgid } for pid=2197 comm="gogo.pl" scontext=system_u:system_r:spacewalk_monitoring_t:s0 tcontext=system_u:system_r:spacewalk_monitoring_t:s0 tclass=process
(cherry picked from commit 08972b855f53289a9ff28541bf72948145b0242b)
diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te
index 483b668..6de55fd 100644
--- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te
+++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te
@@ -160,3 +160,5 @@ corenet_tcp_bind_all_nodes(spacewalk_monitoring_t)
corenet_udp_bind_all_nodes(spacewalk_monitoring_t)
corenet_tcp_connect_ftp_port(spacewalk_monitoring_t)
+
+allow spacewalk_monitoring_t self:process setpgid;
14 years, 9 months
Branch 'SPACEWALK-0.6' - spec-tree/spacewalk-repo
by Jesus M. Rodriguez
spec-tree/spacewalk-repo/spacewalk-repo.spec | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit a45b088c8c881b84e7c9b3620d4681f2134c9e44
Author: jesus m. rodriguez <jesusr(a)redhat.com>
Date: Mon Aug 10 11:02:27 2009 -0400
redefine rhel as RHEL
diff --git a/spec-tree/spacewalk-repo/spacewalk-repo.spec b/spec-tree/spacewalk-repo/spacewalk-repo.spec
index c834178..483ba1e 100644
--- a/spec-tree/spacewalk-repo/spacewalk-repo.spec
+++ b/spec-tree/spacewalk-repo/spacewalk-repo.spec
@@ -1,7 +1,7 @@
Summary: Spacewalk packages yum repository configuration.
Name: spacewalk-repo
Version: 0.6
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPL
Group: Development
# This src.rpm is cannonical upstream
@@ -25,7 +25,7 @@ mkdir -p $RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT
# some sane default value
-%define reposubdir rhel/5Server
+%define reposubdir RHEL/5Server
# redefine on fedora
%{?fedora: %define reposubdir Fedora/%{fedora}}
@@ -47,8 +47,9 @@ rm -rf $RPM_BUILD_ROOT
%config %{_sysconfdir}/yum.repos.d/spacewalk.repo
%changelog
-* Mon Aug 10 2009 jesus m. rodriguez <jesusr(a)redhat.com> 0.6-2
+* Mon Aug 10 2009 jesus m. rodriguez <jesusr(a)redhat.com> 0.6-3
- redefined fedora as Fedora (jesusr(a)redhat.com)
+- redefined rhel as RHEL (jesusr(a)redhat.com)
* Thu Apr 30 2009 Jan Pazdziora 0.6-1
- bump version to 0.6
14 years, 9 months
Changes to 'refs/tags/spacewalk-monitoring-selinux-0.6.13-1'
by Jan Pazdziora
Tag 'spacewalk-monitoring-selinux-0.6.13-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2009-08-10 15:01 +0000
Tagging package [spacewalk-monitoring-selinux] version [0.6.13-1] in directory [selinux/spacewalk-monitoring-selinux/].
Changes since rhnlib-2.5.13-1:
Devan Goodwin (1):
Fix yum-rhn-plugin requiring a version of m2crypto that doesn't exist.
Jan Pazdziora (2):
516073 - allow monitoring to setpgid self.
Automatic commit of package [spacewalk-monitoring-selinux] release [0.6.13-1].
Jason Dobies (3):
Revert "478397 - fixing issue where rhnpush would schedule a taskomatic task to regenerate needed cache and was using a query that didnt generate for all channels (even though it was deleting from all channels)"
443500 - Made sure the call to complete the SSM async operation always takes place. Added hook to associate servers with the operation.
Reapplying accidentally reverted commit: "Revert "478397 - fixing issue where rhnpush would schedule a taskomatic task to regenerate needed cache and was using a query that didnt generate for all channels (even though it was deleting from all channels)""
John Matthews (2):
bumping versions to 0.7.0
Update doc indexes to reside in "en-US"
Justin Sherrill (4):
adding newest fedora gpg key, and moving _data sql file to the right place
adding upgrade for new fedora gpg key
adding reposync task to taskomatic config
478397 - fixing issue where rhnpush would schedule a taskomatic task to regenerate needed cache and was using a query that didnt generate for all channels (even though it was deleting from all channels)
Milan Zazrivec (1):
fix missing column name
Partha Aji (1):
Fixed some table_space issues with schema-updater script
Pradeep Kilambi (1):
516237 - Fix the channel family population task to take into account None counts and use 0 instead while computing the purge count.
---
backend/satellite_tools/sync_handlers.py | 2
backend/spacewalk-backend.spec | 2
client/rhel/rhn-client-tools/rhn-client-tools.spec | 2
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 4
java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml | 3
java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java | 80 +++++-----
java/conf/default/rhn_taskomatic.conf | 5
java/spacewalk-java.spec | 2
proxy/installer/spacewalk-proxy-installer.spec | 2
proxy/proxy-docs/spacewalk-proxy-docs.spec | 2
proxy/proxy/spacewalk-proxy.spec | 2
rel-eng/packages/spacewalk-monitoring-selinux | 2
schema/spacewalk/common/data/rhnContentSourceType.sql | 21 ++
schema/spacewalk/common/data/rhnPackageKey.sql | 2
schema/spacewalk/common/tables/rhnContentSourceType_data.sql | 21 --
schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/193-rhn-PackageKey.sql | 2
scripts/schema-updater | 16 ++
search-server/spacewalk-doc-indexes/spacewalk-doc-indexes.spec | 13 +
search-server/spacewalk-search.spec | 2
selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | 5
selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te | 2
spacewalk/admin/spacewalk-admin.spec | 2
spacewalk/certs-tools/spacewalk-certs-tools.spec | 2
spacewalk/config/spacewalk-config.spec | 2
spacewalk/setup/share/upgrade/rhn-update-monitoring.pl | 2
spec-tree/spacewalk-repo/spacewalk-repo.spec | 2
web/spacewalk-web.spec | 2
27 files changed, 120 insertions(+), 84 deletions(-)
---
14 years, 9 months
rel-eng/packages selinux/spacewalk-monitoring-selinux
by Jan Pazdziora
rel-eng/packages/spacewalk-monitoring-selinux | 2 +-
selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit f01bb0ecfbbaf83ea0f5820b559a6e41eed25973
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Aug 10 17:01:42 2009 +0200
Automatic commit of package [spacewalk-monitoring-selinux] release [0.6.13-1].
diff --git a/rel-eng/packages/spacewalk-monitoring-selinux b/rel-eng/packages/spacewalk-monitoring-selinux
index f0c0ceb..a8c15b6 100644
--- a/rel-eng/packages/spacewalk-monitoring-selinux
+++ b/rel-eng/packages/spacewalk-monitoring-selinux
@@ -1 +1 @@
-0.6.12-1 selinux/spacewalk-monitoring-selinux/
+0.6.13-1 selinux/spacewalk-monitoring-selinux/
diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec
index 6a1c20d..90e231a 100644
--- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec
+++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec
@@ -7,7 +7,7 @@
%define modulename spacewalk-monitoring
Name: spacewalk-monitoring-selinux
-Version: 0.6.12
+Version: 0.6.13
Release: 1%{?dist}
Summary: SELinux policy module supporting Spacewalk monitoring
@@ -144,6 +144,9 @@ fi
%attr(0755,root,root) %{_sbindir}/%{name}-enable
%changelog
+* Mon Aug 10 2009 Jan Pazdziora 0.6.13-1
+- 516073 - allow monitoring to setpgid self
+
* Thu Jun 18 2009 Jan Pazdziora 0.6.12-1
- 505606 - Require at least selinux-policy 2.4.6-80
14 years, 9 months
selinux/spacewalk-monitoring-selinux
by Jan Pazdziora
selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 08972b855f53289a9ff28541bf72948145b0242b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Aug 10 17:00:15 2009 +0200
516073 - allow monitoring to setpgid self.
Addressing:
type=AVC msg=audit(1249571377.161:25): avc: denied { setpgid } for pid=2197 comm="gogo.pl" scontext=system_u:system_r:spacewalk_monitoring_t:s0 tcontext=system_u:system_r:spacewalk_monitoring_t:s0 tclass=process
diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te
index 483b668..6de55fd 100644
--- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te
+++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te
@@ -160,3 +160,5 @@ corenet_tcp_bind_all_nodes(spacewalk_monitoring_t)
corenet_udp_bind_all_nodes(spacewalk_monitoring_t)
corenet_tcp_connect_ftp_port(spacewalk_monitoring_t)
+
+allow spacewalk_monitoring_t self:process setpgid;
14 years, 9 months
Changes to 'refs/tags/spacewalk-schema-0.6.23-1'
by John Matthews
Tag 'spacewalk-schema-0.6.23-1' created by John Matthews <jmatthew(a)redhat.com> at 2009-08-10 14:40 +0000
Tagging package [spacewalk-schema] version [0.6.23-1] in directory [schema/spacewalk/].
Changes since spacewalk-repo-0.6-2:
John Matthews (2):
Automatic commit of package [spacewalk-schema] release [0.6.22-1].
Automatic commit of package [spacewalk-schema] release [0.6.23-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 11 ++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
---
14 years, 9 months
Branch 'SPACEWALK-0.6' - 2 commits - rel-eng/packages schema/spacewalk
by John Matthews
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 11 ++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 68e3aa0c4ea780c7acd1ed878b203152bd42b6db
Author: John Matthews <jmatthew(a)redhat.com>
Date: Mon Aug 10 10:40:10 2009 -0400
Automatic commit of package [spacewalk-schema] release [0.6.23-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 76abf79..61c6797 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-0.6.22-1 schema/spacewalk/
+0.6.23-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index ecfbf83..05f83ff 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 0.6.22
+Version: 0.6.23
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -58,6 +58,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-schema-upgrade*
%changelog
+* Mon Aug 10 2009 John Matthews <jmatthew(a)redhat.com> 0.6.23-1
+- Automatic commit of package [spacewalk-schema] release [0.6.22-1].
+ (jmatthew(a)redhat.com)
+
* Fri Aug 07 2009 John Matthews <jmatthew(a)redhat.com> 0.6.22-1
- adding upgrade for new fedora gpg key (jsherril(a)redhat.com)
- adding newest fedora gpg key, and moving _data sql file to the right place
commit 8854c3dbb8e36d3b68dc1396a84e5cc5843430e3
Author: John Matthews <jmatthew(a)redhat.com>
Date: Fri Aug 7 10:26:27 2009 -0400
Automatic commit of package [spacewalk-schema] release [0.6.22-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 1ef73db..76abf79 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-0.6.21-1 schema/spacewalk/
+0.6.22-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 962e6d6..ecfbf83 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 0.6.21
+Version: 0.6.22
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -58,6 +58,11 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-schema-upgrade*
%changelog
+* Fri Aug 07 2009 John Matthews <jmatthew(a)redhat.com> 0.6.22-1
+- adding upgrade for new fedora gpg key (jsherril(a)redhat.com)
+- adding newest fedora gpg key, and moving _data sql file to the right place
+ (jsherril(a)redhat.com)
+
* Thu Aug 06 2009 Milan Zazrivec <mzazrivec(a)redhat.com> 0.6.21-1
- remove symlinks from schema upgrades
- consistent data in new & upgraded schema
14 years, 9 months
Branch 'VADER' - java/code
by jdob
java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java | 80 +++++-----
1 file changed, 43 insertions(+), 37 deletions(-)
New commits:
commit abdfdbf0fb70147a02d55f077ee29864ff8a7373
Author: Jason Dobies <jason.dobies(a)redhat.com>
Date: Mon Aug 10 10:29:30 2009 -0400
443500 - Made sure the call to complete the SSM async operation always takes place. Added hook to associate servers with the operation.
diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java b/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java
index 994d7bf..55ee1dc 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java
@@ -14,40 +14,31 @@
*/
package com.redhat.rhn.frontend.events;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.apache.log4j.Logger;
import com.redhat.rhn.common.db.datasource.DataResult;
-
import com.redhat.rhn.common.localization.LocalizationService;
-
import com.redhat.rhn.common.messaging.EventMessage;
-
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.server.ServerFactory;
-
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.domain.user.UserFactory;
-
import com.redhat.rhn.frontend.dto.PackageListItem;
-
import com.redhat.rhn.manager.action.ActionManager;
-
import com.redhat.rhn.manager.ssm.SsmOperationManager;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.log4j.Logger;
+import com.redhat.rhn.manager.rhnset.RhnSetDecl;
/**
* Handles removing packages from servers in the SSM.
*
* @see com.redhat.rhn.frontend.events.SsmRemovePackagesEvent
- * @version $Revision$
*/
public class SsmRemovePackagesAction extends AbstractDatabaseAction {
private static Logger log = Logger.getLogger(SsmRemovePackagesAction.class);
@@ -55,30 +46,46 @@ public class SsmRemovePackagesAction extends AbstractDatabaseAction {
/** {@inheritDoc} */
protected void doExecute(EventMessage msg) {
log.debug("Executing package removals.");
- SsmRemovePackagesEvent event = (SsmRemovePackagesEvent) msg;
- DataResult result = event.getResult();
+ SsmRemovePackagesEvent event = (SsmRemovePackagesEvent) msg;
User user = UserFactory.lookupById(event.getUserId());
- Date earliest = event.getEarliest();
LocalizationService ls = LocalizationService.getInstance();
- long operationId = SsmOperationManager.createOperation(user,
- ls.getMessage("ssm.package.remove.operationname"), null);
- int numPackages = 0;
+ String operationMessage = ls.getMessage("ssm.package.remove.operationname");
+ long operationId = SsmOperationManager.createOperation(user, operationMessage,
+ RhnSetDecl.SYSTEMS.getLabel());
+
+ try {
+ scheduleDeletes(event, user);
+ }
+ catch (Exception e) {
+ log.error("Error scheduling package deletes for event: " + event, e);
+ }
+ finally {
+ // This should stay in the finally block so the operation is
+ // not perpetually left in an in progress state
+ SsmOperationManager.completeOperation(user, operationId);
+ }
+ }
+
+ private void scheduleDeletes(SsmRemovePackagesEvent event, User user) {
+
+ DataResult result = event.getResult();
+ Date earliest = event.getEarliest();
/* 443500 - The following was changed to be able to stuff all of the package
- removals into a single action. The schedule package removal page will display
- a fine grained mapping of server to package removed (taking into account to
- only show packages that exist on the server).
+ removals into a single action. The schedule package removal page will display
+ a fine grained mapping of server to package removed (taking into account to
+ only show packages that exist on the server).
- However, there is no issue in requesting a client delete a package it doesn't
- have. So when we create the action, populate it with all packages and for
- every server to which any package removal applies. This will let us keep all
- of the removals coupled under a single scheduled action and won't cause an
- issue on the client when the scheduled removals are picked up.
+ However, there is no issue in requesting a client delete a package it doesn't
+ have. So when we create the action, populate it with all packages and for
+ every server to which any package removal applies. This will let us keep all
+ of the removals coupled under a single scheduled action and won't cause an
+ issue on the client when the scheduled removals are picked up.
- jdobies, Apr 8, 2009
- */
+ jdobies, Apr 8, 2009
+ */
// The package collection is a set to prevent duplciates when keeping a running
// total of all packages selected
@@ -97,12 +104,11 @@ public class SsmRemovePackagesAction extends AbstractDatabaseAction {
Map data = (Map) it.next();
// Load the server
- Long sid = (Long)data.get("id");
+ Long sid = (Long) data.get("id");
allServerIds.add(sid);
// Get the packages out of the elaborator
List elabList = (List) data.get("elaborator0");
- numPackages += elabList.size();
for (Iterator elabIt = elabList.iterator(); elabIt.hasNext();) {
Map elabData = (Map) elabIt.next();
14 years, 9 months
Changes to 'refs/tags/spacewalk-repo-0.6-2'
by Jesus M. Rodriguez
Tag 'spacewalk-repo-0.6-2' created by jesus m. rodriguez <jesusr(a)redhat.com> at 2009-08-10 14:33 +0000
Tagging package [spacewalk-repo] version [0.6-2] in directory [spec-tree/spacewalk-repo/].
Changes since spacewalk-repo-0.7-1:
jesus m. rodriguez (2):
use 0.6-2 NOT 0.7-1
Automatic commit of package [spacewalk-repo] release [0.6-2].
---
rel-eng/packages/spacewalk-repo | 2 +-
spec-tree/spacewalk-repo/spacewalk-repo.spec | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
---
14 years, 9 months