Changes to 'refs/tags/rhncfg-5.9.7.2-1'
by Justin Sherrill
Tag 'rhncfg-5.9.7.2-1' created by Justin Sherrill <jsherril(a)redhat.com> at 2009-08-31 18:48 +0000
Tagging package [rhncfg] version [5.9.7.2-1] in directory [client/tools/rhncfg/].
Changes since spacewalk-java-0.6.47-1:
Justin Sherrill (2):
bumping release of spacewalk 0.6s rhncfg for backport
Automatic commit of package [rhncfg] release [5.9.7.2-1].
---
client/tools/rhncfg/rhncfg.spec | 6 +++++-
rel-eng/packages/rhncfg | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
13 years, 9 months
Branch 'SPACEWALK-0.6' - 2 commits - client/tools java/spacewalk-java.spec rel-eng/packages
by Justin Sherrill
client/tools/rhncfg/rhncfg.spec | 2 +-
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 88b5eaef4eadb237646fa82ce97f5abdf8350cc5
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Aug 31 14:48:06 2009 -0400
bumping release of spacewalk 0.6s rhncfg for backport
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index c0044c6..3bfed62 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -8,7 +8,7 @@ Group: Applications/System
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.9.7
+Version: 5.9.7.1
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
commit fa289e8bfb1ad638d636f26e5497bf5722744772
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Aug 31 14:18:05 2009 -0400
Automatic commit of package [spacewalk-java] release [0.6.47-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 42ced3b..a506466 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -12,7 +12,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.6.46
+Version: 0.6.47
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -257,6 +257,10 @@ fi
%attr(644, root, root) %{_datadir}/rhn/lib/rhn.jar
%changelog
+* Mon Aug 31 2009 Justin Sherrill <jsherril(a)redhat.com> 0.6.47-1
+- making RepoSyncTask use the --quiet flag for repo syncing
+ (jsherril(a)redhat.com)
+
* Mon Aug 24 2009 Justin Sherrill <jsherril(a)redhat.com> 0.6.46-1
- 518342 - adding workaround for RHEL5u4 bug failing to register when dbus and
hal are not running (jsherril(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index be85bec..c60c72a 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-0.6.46-1 java/
+0.6.47-1 java/
13 years, 9 months
Changes to 'refs/tags/spacewalk-java-0.6.47-1'
by Justin Sherrill
Tag 'spacewalk-java-0.6.47-1' created by Justin Sherrill <jsherril(a)redhat.com> at 2009-08-31 18:18 +0000
Tagging package [spacewalk-java] version [0.6.47-1] in directory [java/].
Changes since spacewalk-web-0.6.20-1:
Justin Sherrill (1):
Automatic commit of package [spacewalk-java] release [0.6.47-1].
---
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
13 years, 9 months
Branch 'SPACEWALK-0.6' - rel-eng/packages web/spacewalk-web.spec
by Justin Sherrill
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 07d641723928d98d9b66d7994cd0500ba6102fd2
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Aug 31 14:04:07 2009 -0400
Automatic commit of package [spacewalk-web] release [0.6.20-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 6416cdb..89027e1 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-0.6.19-1 web/
+0.6.20-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 933b416..2c9c12a 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.6.19
+Version: 0.6.20
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -317,6 +317,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Mon Aug 31 2009 Justin Sherrill <jsherril(a)redhat.com> 0.6.20-1
+- fix an ISE relating to config management w/selinux (msuchy(a)redhat.com)
+
* Wed Aug 05 2009 John Matthews <jmatthew(a)redhat.com> 0.6.19-1
- 515580 - remove hard links to scooby.rdu (shughes(a)redhat.com)
13 years, 9 months
Changes to 'refs/tags/spacewalk-web-0.6.20-1'
by Justin Sherrill
Tag 'spacewalk-web-0.6.20-1' created by Justin Sherrill <jsherril(a)redhat.com> at 2009-08-31 18:04 +0000
Tagging package [spacewalk-web] version [0.6.20-1] in directory [web/].
Changes since spacewalk-backend-0.6.31-1:
Justin Sherrill (1):
Automatic commit of package [spacewalk-web] release [0.6.20-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years, 9 months
Changes to 'refs/tags/spacewalk-backend-0.6.31-1'
by Justin Sherrill
Tag 'spacewalk-backend-0.6.31-1' created by Justin Sherrill <jsherril(a)redhat.com> at 2009-08-31 18:02 +0000
Tagging package [spacewalk-backend] version [0.6.31-1] in directory [backend/].
Changes since rhn-client-tools-0.6.4-1:
Justin Sherrill (1):
Automatic commit of package [spacewalk-backend] release [0.6.31-1].
Miroslav Suchý (1):
fix an ISE relating to config management w/selinux
---
backend/server/configFilesHandler.py | 4 +++-
backend/spacewalk-backend.spec | 6 +++++-
client/tools/rhncfg/config_common/repository.py | 9 +++++++++
rel-eng/packages/spacewalk-backend | 2 +-
web/modules/rhn/RHN/AppInstall/ActionHandler/ActionRunner.pm | 2 ++
web/modules/rhn/RHN/DB/ConfigRevision.pm | 4 ++--
web/modules/rhn/RHN/ProxyInstall.pm | 2 ++
7 files changed, 24 insertions(+), 5 deletions(-)
---
13 years, 9 months
Branch 'SPACEWALK-0.6' - backend/spacewalk-backend.spec rel-eng/packages
by Justin Sherrill
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 6f1ba6cea134a0c58ccd0a98566b391f22e8d7c8
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Aug 31 14:02:45 2009 -0400
Automatic commit of package [spacewalk-backend] release [0.6.31-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 495fdde..60b62ee 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -7,7 +7,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 0.6.30
+Version: 0.6.31
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -579,6 +579,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon Aug 31 2009 Justin Sherrill <jsherril(a)redhat.com> 0.6.31-1
+- fix an ISE relating to config management w/selinux (msuchy(a)redhat.com)
+- adding --quiet flag to spacewalk-repo-sync (jsherril(a)redhat.com)
+
* Wed Aug 05 2009 Pradeep Kilambi <pkilambi(a)redhat.com> 0.6.30-1
-
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index be33a60..6db8319 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.6.30-1 backend/
+0.6.31-1 backend/
13 years, 9 months
Branch 'SPACEWALK-0.6' - backend/server client/tools web/modules
by Justin Sherrill
backend/server/configFilesHandler.py | 4 +++-
client/tools/rhncfg/config_common/repository.py | 9 +++++++++
web/modules/rhn/RHN/AppInstall/ActionHandler/ActionRunner.pm | 2 ++
web/modules/rhn/RHN/DB/ConfigRevision.pm | 4 ++--
web/modules/rhn/RHN/ProxyInstall.pm | 2 ++
5 files changed, 18 insertions(+), 3 deletions(-)
New commits:
commit 82c993afb4324e5702e69ba0cec35692c79c98ad
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Aug 20 10:08:34 2009 +0200
fix an ISE relating to config management w/selinux
Contributed by Joshua Roys:
Attached is a patch to kill another bug in the configuration management w/selinux. Specifically, backend/server/configFilesHandler.py ended up calling the old version of lookup_config_info, which caused all file uploads to fail in an ISE. In fixing this, I also added functionality to upload the selinux context of files to spacewalk in client/tools/rhncfg/config_common/repository.py . The other changes are for completeness, as they look like they could cause problems in the future.
diff --git a/backend/server/configFilesHandler.py b/backend/server/configFilesHandler.py
index 996d221..f00a937 100644
--- a/backend/server/configFilesHandler.py
+++ b/backend/server/configFilesHandler.py
@@ -158,6 +158,8 @@ class ConfigFilesHandler(rhnHandler):
file['username'] = file['user']
file['groupname'] = file['group']
file['file_mode'] = file['mode']
+ if not file.has_key('selinux_ctx'):
+ file['selinux_ctx'] = ''
result = {}
@@ -321,7 +323,7 @@ class ConfigFilesHandler(rhnHandler):
lob.write(file_contents)
_query_lookup_config_info = rhnSQL.Statement("""
- select lookup_config_info(:username, :groupname, :file_mode) id
+ select lookup_config_info(:username, :groupname, :file_mode, :selinux_ctx) id
from dual
""")
diff --git a/client/tools/rhncfg/config_common/repository.py b/client/tools/rhncfg/config_common/repository.py
index f49f750..78abc9e 100644
--- a/client/tools/rhncfg/config_common/repository.py
+++ b/client/tools/rhncfg/config_common/repository.py
@@ -27,6 +27,13 @@ import utils
from rhn_log import log_debug, die
#from rhn_rpc import rpclib
+try:
+ from selinux import getfilecon
+except:
+ # on rhel4 we do not support selinux
+ def getfilecon(path):
+ return [0, ''];
+
#6/29/05 rpc_wrapper implements the failover logic.
import rpc_wrapper
@@ -125,6 +132,8 @@ class Repository:
ret['group'] = gr_name
self._gid_cache[gid] = gr_name
+ ret['selinux_ctx'] = getfilecon(path)[1]
+
return ret
def _make_file_info(self, remote_path, local_path=None, delim_start=None,
diff --git a/web/modules/rhn/RHN/AppInstall/ActionHandler/ActionRunner.pm b/web/modules/rhn/RHN/AppInstall/ActionHandler/ActionRunner.pm
index d19c1ca..0dff388 100644
--- a/web/modules/rhn/RHN/AppInstall/ActionHandler/ActionRunner.pm
+++ b/web/modules/rhn/RHN/AppInstall/ActionHandler/ActionRunner.pm
@@ -205,6 +205,7 @@ sub generate_config_file {
groupname => { default => 'root' },
mode => { default => '770' },
new_only => { default => 0 },
+ selinux_ctx => { default => '' },
});
my $template_file = File::Spec->catfile($session->get_app_instance->get_app_dir(), $params{template});
@@ -239,6 +240,7 @@ sub generate_config_file {
$new_revision->groupname($params{groupname});
$new_revision->filemode($params{mode});
$new_revision->contents($contents);
+ $new_revision->selinux_ctx($params{selinux_ctx});
eval {
$new_revision->commit;
diff --git a/web/modules/rhn/RHN/DB/ConfigRevision.pm b/web/modules/rhn/RHN/DB/ConfigRevision.pm
index 1765b9c..3575fb7 100644
--- a/web/modules/rhn/RHN/DB/ConfigRevision.pm
+++ b/web/modules/rhn/RHN/DB/ConfigRevision.pm
@@ -30,7 +30,7 @@ our @ISA = qw/RHN::SimpleStruct/;
our @core_fields = qw/id revision config_file_id config_content_id
config_info_id delim_start delim_end created
modified username groupname filemode latest_id latest path
- md5sum file_size org_id config_channel_id filetype/;
+ md5sum file_size org_id config_channel_id filetype selinux_ctx/;
our @transient_fields = qw/__contents__ is_binary/;
our @simple_struct_fields = (@core_fields, @transient_fields);
@@ -154,7 +154,7 @@ sub commit {
}
my $dbh = RHN::DB->connect;
- my $ciid = $dbh->call_function('lookup_config_info', $self->username, $self->groupname, $self->filemode);
+ my $ciid = $dbh->call_function('lookup_config_info', $self->username, $self->groupname, $self->filemode, $self->selinux_ctx);
my $ccid = $self->config_content_id;
my $cftid = getFileTypeId($self->filetype);
diff --git a/web/modules/rhn/RHN/ProxyInstall.pm b/web/modules/rhn/RHN/ProxyInstall.pm
index 4079add..505a506 100644
--- a/web/modules/rhn/RHN/ProxyInstall.pm
+++ b/web/modules/rhn/RHN/ProxyInstall.pm
@@ -370,6 +370,7 @@ sub import_file {
username => { default => 'root' },
groupname => { default => 'root' },
mode => { default => 770 },
+ selinux_ctx => { default => '' },
});
my $cc = $params{config_channel};
@@ -394,6 +395,7 @@ sub import_file {
$new_revision->groupname($params{groupname});
$new_revision->filemode($params{mode});
$new_revision->contents($params{content});
+ $new_revision->selinux_ctx($params{selinux_ctx});
$new_revision->commit;
13 years, 9 months
Changes to 'refs/tags/spacewalk-setup-0.7.2-1'
by Milan Zazrivec
Tag 'spacewalk-setup-0.7.2-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2009-08-28 16:10 +0000
Tagging package [spacewalk-setup] version [0.7.2-1] in directory [spacewalk/setup/].
Changes since spacewalk-setup-0.7.1-1:
Milan Zazrivec (2):
Require libxslt (xsltproc)
Automatic commit of package [spacewalk-setup] release [0.7.2-1].
---
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
---
13 years, 9 months
2 commits - rel-eng/packages spacewalk/setup
by Milan Zazrivec
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 391eefd6233bc9f4bce1c1bcfd102066ae878aac
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Aug 28 18:10:28 2009 +0200
Automatic commit of package [spacewalk-setup] release [0.7.2-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index 284be8a..57aab70 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-0.7.1-1 spacewalk/setup/
+0.7.2-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 13f5c1b..efe7ac5 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 0.7.1
+Version: 0.7.2
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -106,7 +106,7 @@ rm -rf %{buildroot}
%dir %{_sysconfdir}/pki/spacewalk/jabberd
%changelog
-* Fri Aug 28 2009 Milan Zazrivec <mzazrivec(a)redhat.com> 0.7.1-1
+* Fri Aug 28 2009 Milan Zazrivec <mzazrivec(a)redhat.com> 0.7.2-1
- add spacewalk-setup-jabberd script (mzazrivec(a)redhat.com)
- bumping Version to 0.7.0 (jmatthew(a)redhat.com)
- As /usr/bin/spacewalk-setup calls /usr/bin/gpg, we should Require it.
commit b72418ec0b24e3762200874e1b7cd550c390bb5f
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Aug 28 18:10:04 2009 +0200
Require libxslt (xsltproc)
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index eb01774..13f5c1b 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -29,6 +29,7 @@ Requires: cobbler >= 1.6.3
Requires: PyYAML
Requires: jabberd
Requires: /usr/bin/gpg
+Requires: libxslt
%description
13 years, 9 months