selinux/spacewalk-monitoring-selinux
by Jan Pazdziora
selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te | 7 +++++++
1 file changed, 7 insertions(+)
New commits:
commit a1ef5ff8164dc9e23b5a3618408ae7fbb634bac4
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jan 4 15:18:42 2013 +0100
Allow rhnmd to traverse /var/lib/nocpulse on Spacewalk server.
Addressing
avc: denied { search } for pid=15084 comm="rhnmd" name="nocpulse" dev=dm-0 ino=2627797 scontext=unconfined_u:system_r:sshd_t:s0-s0:c0.c1023 tcontext=system_u:object_r:spacewalk_monitoring_var_lib_t:s0 tclass=dir
Could not load host key: /var/lib/nocpulse/.ssh/nocpulse-identity
diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te
index 5101a45..65996fa 100644
--- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te
+++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te
@@ -187,3 +187,10 @@ optional_policy(`
')
mta_send_mail(spacewalk_monitoring_t)
+
+optional_policy(`
+ gen_require(`
+ type sshd_t;
+ ')
+ allow sshd_t spacewalk_monitoring_var_lib_t:dir { search getattr };
+')
11 years, 3 months
Changes to 'refs/tags/spacewalk-setup-jabberd-1.9.1-1'
by Jan Pazdziora
Tag 'spacewalk-setup-jabberd-1.9.1-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-01-04 14:16 +0000
Tagging package [spacewalk-setup-jabberd] version [1.9.1-1] in directory [spacewalk/spacewalk-setup-jabberd/].
Changes since rhnmd-5.3.15-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-setup-jabberd] release [1.9.1-1].
---
rel-eng/packages/spacewalk-setup-jabberd | 2 +-
spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
11 years, 3 months
rel-eng/packages spacewalk/spacewalk-setup-jabberd
by Jan Pazdziora
rel-eng/packages/spacewalk-setup-jabberd | 2 +-
spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit fc2ba688c3bd985530abc5fa2255d1d5dcabef5d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jan 4 15:16:39 2013 +0100
Automatic commit of package [spacewalk-setup-jabberd] release [1.9.1-1].
diff --git a/rel-eng/packages/spacewalk-setup-jabberd b/rel-eng/packages/spacewalk-setup-jabberd
index 5df664b..b5dc3f7 100644
--- a/rel-eng/packages/spacewalk-setup-jabberd
+++ b/rel-eng/packages/spacewalk-setup-jabberd
@@ -1 +1 @@
-1.8.7-1 spacewalk/spacewalk-setup-jabberd/
+1.9.1-1 spacewalk/spacewalk-setup-jabberd/
diff --git a/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec b/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec
index cbfbe07..3e38029 100644
--- a/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec
+++ b/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup-jabberd
-Version: 1.9.0
+Version: 1.9.1
Release: 1%{?dist}
Summary: Tools to setup jabberd for Spacewalk
Group: Applications/System
@@ -57,6 +57,10 @@ rm -rf %{buildroot}
%{_sysconfdir}/pki/spacewalk
%changelog
+* Fri Jan 04 2013 Jan Pazdziora 1.9.1-1
+- 858689 - simplify the code
+- 858689 - correct check for /proc/net/if_inet6 size
+
* Tue Oct 30 2012 Jan Pazdziora 1.8.7-1
- Update the copyright year.
11 years, 3 months
Changes to 'refs/tags/rhnmd-5.3.15-1'
by Jan Pazdziora
Tag 'rhnmd-5.3.15-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-01-04 14:16 +0000
Tagging package [rhnmd] version [5.3.15-1] in directory [monitoring/rhnmd/].
Changes since spacewalk-java-1.9.36-1:
Jan Pazdziora (3):
The daemon does success for us.
We may need to define the port 4545 as ours to use.
Automatic commit of package [rhnmd] release [5.3.15-1].
Milan Zazrivec (1):
858689 - simplify the code
Tomas Lestach (1):
fix ChannelSoftwareHandlerTest unit test
---
java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java | 6 ++---
monitoring/rhnmd/rhnmd-init | 2 -
monitoring/rhnmd/rhnmd.spec | 11 +++++++++-
rel-eng/packages/rhnmd | 2 -
spacewalk/spacewalk-setup-jabberd/bin/spacewalk-setup-jabberd | 6 +----
5 files changed, 17 insertions(+), 10 deletions(-)
---
11 years, 3 months
monitoring/rhnmd rel-eng/packages
by Jan Pazdziora
monitoring/rhnmd/rhnmd.spec | 6 +++++-
rel-eng/packages/rhnmd | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 406f0c6fb48fcf06e39b7c95e9391c96c8c8b658
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jan 4 15:16:02 2013 +0100
Automatic commit of package [rhnmd] release [5.3.15-1].
diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec
index b074da8..d6419fc 100644
--- a/monitoring/rhnmd/rhnmd.spec
+++ b/monitoring/rhnmd/rhnmd.spec
@@ -8,7 +8,7 @@ Summary: Red Hat Network Monitoring Daemon
Name: rhnmd
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.3.14
+Version: 5.3.15
Release: 1%{?dist}
License: GPLv2
BuildArch: noarch
@@ -187,6 +187,10 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Fri Jan 04 2013 Jan Pazdziora 5.3.15-1
+- We may need to define the port 4545 as ours to use.
+- The daemon does success for us.
+
* Mon Dec 10 2012 Michael Mraka <michael.mraka(a)redhat.com> 5.3.14-1
- added missing pid file
- fixed service description
diff --git a/rel-eng/packages/rhnmd b/rel-eng/packages/rhnmd
index 884a5ef..3a6aa1d 100644
--- a/rel-eng/packages/rhnmd
+++ b/rel-eng/packages/rhnmd
@@ -1 +1 @@
-5.3.14-1 monitoring/rhnmd/
+5.3.15-1 monitoring/rhnmd/
11 years, 3 months
monitoring/rhnmd
by Jan Pazdziora
monitoring/rhnmd/rhnmd.spec | 5 +++++
1 file changed, 5 insertions(+)
New commits:
commit 5de4cee152933cc856372fdf9fb4eac05032fae4
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jan 4 14:39:02 2013 +0100
We may need to define the port 4545 as ours to use.
Addressing
avc: denied { name_bind } for pid=7041 comm="rhnmd" src=4545 scontext=system_u:system_r:sshd_t:s0-s0:c0.c1023 tcontext=system_u:object_r:unreserved_port_t:s0 tclass=tcp_socket
diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec
index ed08e41..b074da8 100644
--- a/monitoring/rhnmd/rhnmd.spec
+++ b/monitoring/rhnmd/rhnmd.spec
@@ -47,6 +47,7 @@ Provides: rhnmd.i386 = %{version}
Provides: rhnmd.x86_64 = %{version}
Requires(post): /usr/sbin/semanage, /sbin/restorecon
+Requires(preun): /usr/sbin/semanage
%description
rhnmd enables secure ssh-based communication between the monitoring
@@ -138,6 +139,9 @@ fi
/usr/sbin/semanage fcontext -a -t ssh_home_t '/var/lib/nocpulse/\.ssh/authorized_keys' || :
%endif
/sbin/restorecon -rvv /var/lib/nocpulse || :
+%if 0%{?fedora}
+/usr/sbin/semanage port -l | grep -q '^ssh_port_t\b.*\btcp\b.*\b4545\b' || /usr/sbin/semanage port -a -t ssh_port_t -p tcp 4545 || :
+%endif
%endif
%preun
@@ -147,6 +151,7 @@ fi
if [ $1 = 0 ]; then
%if 0%{?fedora}
/bin/systemctl stop rhnmd.service >/dev/null 2>&1
+ /usr/sbin/semanage port -d -t ssh_port_t -p tcp 4545 || :
%else
/sbin/service rhnmd stop > /dev/null 2>&1
%endif
11 years, 3 months
monitoring/rhnmd
by Jan Pazdziora
monitoring/rhnmd/rhnmd-init | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4ab057b2eceae9aa1f9e393e78cedb30e986ae2b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jan 4 14:18:12 2013 +0100
The daemon does success for us.
Addressing
[ OK ] rhnmd:[ OK ]
diff --git a/monitoring/rhnmd/rhnmd-init b/monitoring/rhnmd/rhnmd-init
index f68b539..2105162 100644
--- a/monitoring/rhnmd/rhnmd-init
+++ b/monitoring/rhnmd/rhnmd-init
@@ -42,7 +42,7 @@ do_restart_sanity_check()
start()
{
echo -n $"Starting $prog:"
- daemon --user nocpulse $SSHD -f /etc/nocpulse/rhnmd_config && success || failure
+ daemon --user nocpulse $SSHD -f /etc/nocpulse/rhnmd_config
RETVAL=$?
[ "$RETVAL" = 0 ] && touch /var/lock/subsys/rhnmd
echo
11 years, 3 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit bf3bfa3c60ba13e0a87f7a19818b449aa9fe920a
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jan 3 14:39:44 2013 +0100
fix ChannelSoftwareHandlerTest unit test
diff --git a/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java b/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java
index eb1b7e3..1d34fc7 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java
@@ -119,9 +119,9 @@ public class ChannelFactoryTest extends RhnBaseTestCase {
Date lastmodified = new Date();
Date created = new Date();
Date modified = new Date();
- String gpgurl = "TestChannel gpg key url";
- String gpgid = "GPGKEYID";
- String gpgfp = "TestChannel gpg key fp";
+ String gpgurl = "https://gpg.url";
+ String gpgid = "B3BCE11D";
+ String gpgfp = "AAAA BBBB CCCC DDDD EEEE FFFF 7777 8888 9999 0000";
Calendar cal = Calendar.getInstance();
cal.roll(Calendar.DATE, true);
Date endoflife = new Date(System.currentTimeMillis() + Integer.MAX_VALUE);
11 years, 3 months
spacewalk/spacewalk-setup-jabberd
by Milan Zazrivec
spacewalk/spacewalk-setup-jabberd/bin/spacewalk-setup-jabberd | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 1c3108f0929bd90748bd367fe5560801dc5cf842
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Jan 3 08:58:49 2013 +0100
858689 - simplify the code
diff --git a/spacewalk/spacewalk-setup-jabberd/bin/spacewalk-setup-jabberd b/spacewalk/spacewalk-setup-jabberd/bin/spacewalk-setup-jabberd
index b2a52f5..a7a9d4d 100755
--- a/spacewalk/spacewalk-setup-jabberd/bin/spacewalk-setup-jabberd
+++ b/spacewalk/spacewalk-setup-jabberd/bin/spacewalk-setup-jabberd
@@ -39,13 +39,11 @@ my $if_inet6 = "/proc/net/if_inet6";
if (-f $if_inet6) {
local *F;
open F, $if_inet6 or die "Error opening $if_inet6: $!\n";
- my $lines = @{[<F>]};
- close F;
-
- if ($lines > 0) {
+ if (defined <F>) {
$macros{'localhost'} = '::1';
$macros{'ipaddress'} = '::';
}
+ close F;
}
my $usage = <<EOHELP;
11 years, 3 months
Changes to 'refs/tags/spacewalk-java-1.9.36-1'
by StephenHerr
Tag 'spacewalk-java-1.9.36-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-01-02 19:50 +0000
Tagging package [spacewalk-java] version [1.9.36-1] in directory [java/].
Changes since spacewalk-java-1.9.35-1:
Milan Zazrivec (1):
858689 - correct check for /proc/net/if_inet6 size
Stephen Herr (2):
890344 - fixing dependency list in taskomatic SysV script
Automatic commit of package [spacewalk-java] release [1.9.36-1].
---
java/scripts/taskomatic | 2 -
java/spacewalk-java.spec | 5 ++-
rel-eng/packages/spacewalk-java | 2 -
spacewalk/spacewalk-setup-jabberd/bin/spacewalk-setup-jabberd | 14 +++++++---
4 files changed, 17 insertions(+), 6 deletions(-)
---
11 years, 3 months