monitoring/rhnmd/rhnmd-init | 2 +-
monitoring/rhnmd/rhnmd-wrap | 9 ---------
monitoring/rhnmd/rhnmd.spec | 13 +++++++------
monitoring/rhnmd/rhnmdwrap.c | 12 ------------
rel-eng/packages/rhnmd | 2 +-
5 files changed, 9 insertions(+), 29 deletions(-)
New commits:
commit 823dc7e7e864138261362eb11d866e07f6b50c1a
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Nov 2 14:04:08 2009 +0100
Automatic commit of package [rhnmd] release [5.3.3-1].
diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec
index 97fd94d..c436c16 100644
--- a/monitoring/rhnmd/rhnmd.spec
+++ b/monitoring/rhnmd/rhnmd.spec
@@ -5,7 +5,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.2
+Version: 5.3.3
Release: 1%{?dist}
License: GPLv2
BuildArch: noarch
@@ -84,6 +84,9 @@ if [ $1 = 0 ]; then
fi
%changelog
+* Mon Nov 2 2009 Miroslav Suchý <msuchy(a)redhat.com> 5.3.3-1
+- make rhnmd package noarch
+
* Fri Apr 10 2009 Miroslav Suchý <msuchy(a)redhat.com> 5.3.2-1
- 494538 - remove the dependecy of rhnmd on nocpulse-common
diff --git a/rel-eng/packages/rhnmd b/rel-eng/packages/rhnmd
index efe259b..c623cf1 100644
--- a/rel-eng/packages/rhnmd
+++ b/rel-eng/packages/rhnmd
@@ -1 +1 @@
-5.3.2-1 monitoring/rhnmd/
+5.3.3-1 monitoring/rhnmd/
commit 79743f3c86f662ab662675b90e54d0d55b25f96b
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Nov 2 13:57:49 2009 +0100
make rhnmd package noarch
That stuff with wrapper has been created becouse in RHEL2 was not
possible to start sshd as normal user. RHEL2 is no longer supported,
so we can remove this hack.
Since there is no binary, making package noarch.
diff --git a/monitoring/rhnmd/rhnmd-init b/monitoring/rhnmd/rhnmd-init
index 98651eb..f68b539 100644
--- a/monitoring/rhnmd/rhnmd-init
+++ b/monitoring/rhnmd/rhnmd-init
@@ -27,7 +27,7 @@ prog="rhnmd"
# Some functions to make the below more readable
SU="/sbin/runuser -s /bin/bash - nocpulse -c"
-SSHD="/usr/sbin/rhnmd-wrap"
+SSHD="/usr/sbin/rhnmd"
do_restart_sanity_check()
{
diff --git a/monitoring/rhnmd/rhnmd-wrap b/monitoring/rhnmd/rhnmd-wrap
deleted file mode 100644
index 2bb096b..0000000
--- a/monitoring/rhnmd/rhnmd-wrap
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ -r /usr/lib64/librhnmdwrap.so ]
-then
- LD_PRELOAD_64=/usr/lib64/librhnmdwrap.so exec /usr/sbin/rhnmd $*
-else
- LD_PRELOAD_32=/usr/lib/librhnmdwrap.so exec /usr/sbin/rhnmd $*
-fi
-
diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec
index 3390a90..97fd94d 100644
--- a/monitoring/rhnmd/rhnmd.spec
+++ b/monitoring/rhnmd/rhnmd.spec
@@ -8,10 +8,11 @@ Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.ta
Version: 5.3.2
Release: 1%{?dist}
License: GPLv2
+BuildArch: noarch
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: openssh-server openssh
-BuildRequires: pam-devel gcc
+BuildRequires: pam-devel
%description
rhnmd enables secure ssh-based communication between the monitoring
@@ -21,7 +22,7 @@ scout and the monitored host.
%setup -q
%build
-gcc %{optflags} -Wall -shared rhnmdwrap.c -o librhnmdwrap.so -fPIC
+#nothing to do
%install
rm -rf $RPM_BUILD_ROOT
@@ -37,9 +38,7 @@ ln -sf sshd $RPM_BUILD_ROOT%{_usr}/sbin/rhnmd
install -m 0755 rhnmd-init $RPM_BUILD_ROOT%{_initrddir}/rhnmd
install -m 0644 rhnmd_config $RPM_BUILD_ROOT%{_sysconfdir}/%{np_name}/rhnmd_config
install -m 0600 authorized_keys
$RPM_BUILD_ROOT%{_var}/lib/%{np_name}/.ssh/authorized_keys
-install -m 0755 rhnmd-wrap $RPM_BUILD_ROOT%{_usr}/sbin/rhnmd-wrap
install -m 0644 rhnmd-pam_config $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/rhnmd
-install -m 0755 librhnmdwrap.so $RPM_BUILD_ROOT%{_libdir}/librhnmdwrap.so
%pre
if [ $1 -eq 1 ] ; then
@@ -74,7 +73,6 @@ rm -rf $RPM_BUILD_ROOT
%dir %attr(700, %{np_name},%{np_name}) %{_var}/lib/%{np_name}/.ssh
%config(noreplace) %attr(-, %{np_name},%{np_name})
%{_var}/lib/%{np_name}/.ssh/authorized_keys
%{_usr}/sbin/*
-%{_libdir}/librhnmdwrap.so
%config(noreplace) %{_sysconfdir}/%{np_name}/*
%{_initrddir}/rhnmd
%doc LICENSE
diff --git a/monitoring/rhnmd/rhnmdwrap.c b/monitoring/rhnmd/rhnmdwrap.c
deleted file mode 100644
index bbf9af1..0000000
--- a/monitoring/rhnmd/rhnmdwrap.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <sys/types.h>
-#include <unistd.h>
-#include <grp.h>
-#include <security/pam_appl.h>
-
-/* This hack is needed to get around a Red Hat patch that disallows
-non-root users to run the sshd binary. */
-
-int setgroups(size_t size, const gid_t *list)
-{
- return 0;
-}