From: rmccabe@sourceware.org <rmccabe@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga make/version.in ./clustermon.spec.in.in ...
Date: 16 Jul 2007 21:06:15 -0000 [thread overview]
Message-ID: <20070716210615.32279.qmail@sourceware.org> (raw)
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: rmccabe at sourceware.org 2007-07-16 21:06:14
Modified files:
make : version.in
. : clustermon.spec.in.in conga.spec.in.in
Log message:
Fix 248317: luci sets incorrect permissions on /usr/lib64/luci and /var/lib/luci
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.18&r2=1.21.2.19
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.18.2.19&r2=1.18.2.20
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.45&r2=1.45.2.46
--- conga/make/version.in 2007/06/27 07:43:35 1.21.2.18
+++ conga/make/version.in 2007/07/16 21:06:14 1.21.2.19
@@ -1,5 +1,5 @@
VERSION=0.10.0
-RELEASE=1
+RELEASE=2
# Remove "_UNRELEASED" at release time.
# Put release num at the beggining,
# so that after it gets released, it has
--- conga/clustermon.spec.in.in 2007/06/27 07:49:06 1.18.2.19
+++ conga/clustermon.spec.in.in 2007/07/16 21:06:14 1.18.2.20
@@ -34,7 +34,7 @@
BuildRequires: net-snmp-devel tog-pegasus-devel
%description
-This package contains Red Hat Enterprise Linux Cluster Suite
+This package contains Red Hat Enterprise Linux Cluster Suite
SNMP/CIM module/agent/provider.
@@ -42,7 +42,7 @@
%setup -q
%build
-%configure --arch=%{_arch} \
+%configure --arch=%{_arch} \
--docdir=%{_docdir} \
--pegasus_providers_dir=%{PEGASUS_PROVIDERS_DIR} \
--include_zope_and_plone=no
@@ -96,18 +96,18 @@
%preun -n modcluster
if [ "$1" == "0" ]; then
- /sbin/service modclusterd stop > /dev/null 2>&1
- /sbin/chkconfig --del modclusterd
+ /sbin/service modclusterd stop > /dev/null 2>&1
+ /sbin/chkconfig --del modclusterd
fi
%postun -n modcluster
if [ "$1" == "0" ]; then
- DBUS_PID=`cat /var/run/messagebus.pid 2> /dev/null`
- /bin/kill -s SIGHUP $DBUS_PID > /dev/null 2>&1
- /sbin/service oddjobd reload > /dev/null 2>&1
+ DBUS_PID=`cat /var/run/messagebus.pid 2> /dev/null`
+ /bin/kill -s SIGHUP $DBUS_PID > /dev/null 2>&1
+ /sbin/service oddjobd reload > /dev/null 2>&1
fi
if [ "$1" == "1" ]; then
- /sbin/service modclusterd condrestart > /dev/null 2>&1
+ /sbin/service modclusterd condrestart > /dev/null 2>&1
fi
@@ -121,7 +121,7 @@
Summary: Red Hat Enterprise Linux Cluster Suite - SNMP agent
Requires: modcluster = %{version}-%{release}
-Requires: net-snmp
+Requires: net-snmp
Requires: oddjob openssl
Requires(post): initscripts
Requires(postun): initscripts
@@ -143,7 +143,7 @@
%postun -n cluster-snmp
# don't restart snmpd twice on upgrades
if [ "$1" == "0" ]; then
- /sbin/service snmpd condrestart > /dev/null 2>&1
+ /sbin/service snmpd condrestart > /dev/null 2>&1
fi
@@ -158,14 +158,14 @@
Summary: Red Hat Enterprise Linux Cluster Suite - CIM provider
Requires: modcluster = %{version}-%{release}
-Requires: tog-pegasus
+Requires: tog-pegasus
Requires: oddjob openssl
Requires(post): initscripts
Requires(postun): initscripts
Conflicts: clumon-cim
%description -n cluster-cim
-CIM provider for Red Hat Enterprise Linux Cluster Suite.
+CIM provider for Red Hat Enterprise Linux Cluster Suite.
%files -n cluster-cim
%defattr(-,root,root)
@@ -179,7 +179,7 @@
%postun -n cluster-cim
# don't restart pegasus twice on upgrades
if [ "$1" == "0" ]; then
- /sbin/service tog-pegasus condrestart > /dev/null 2>&1
+ /sbin/service tog-pegasus condrestart > /dev/null 2>&1
fi
# pegasus might not be running, don't fail %postun
exit 0
@@ -269,5 +269,5 @@
- Don't auto-start modclusterd after installation, do it manually
* Wed Aug 09 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-11
-- Spinoff: separate clustermon.srpm (modcluster, cluster-snmp and
- cluster-cim) from conga.srpm
+- Spinoff: separate clustermon.srpm (modcluster, cluster-snmp and
+ cluster-cim) from conga.srpm
--- conga/conga.spec.in.in 2007/07/12 04:41:39 1.45.2.45
+++ conga/conga.spec.in.in 2007/07/16 21:06:14 1.45.2.46
@@ -11,7 +11,7 @@
###############################################################################
-%define include_zope_and_plone @@INCLUDE_ZOPE_AND_PLONE@@
+%define include_zope_and_plone @@INCLUDE_ZOPE_AND_PLONE@@
@@ -44,9 +44,9 @@
%description
-Conga is a project developing management system for remote stations.
-It consists of luci, https frontend, and ricci, secure daemon that dispatches
-incoming messages to underlying management modules.
+Conga is a project developing management system for remote stations.
+It consists of luci, https frontend, and ricci, secure daemon that dispatches
+incoming messages to underlying management modules.
%prep
@@ -64,7 +64,7 @@
%endif
%build
-%configure --arch=%{_arch} \
+%configure --arch=%{_arch} \
--docdir=%{_docdir} \
--include_zope_and_plone=%{include_zope_and_plone}
make %{?_smp_mflags} conga
@@ -101,7 +101,7 @@
Requires: zope
Requires: plone >= 2.5
%endif
-Requires: grep openssl mailcap stunnel
+Requires: grep openssl mailcap stunnel
Requires: sed util-linux
Requires(pre): grep shadow-utils
@@ -110,9 +110,9 @@
%description -n luci
-Conga is a project developing management system for remote stations.
-It consists of luci, https frontend, and ricci, secure daemon that
-dispatches incoming messages to underlying management modules.
+Conga is a project developing management system for remote stations.
+It consists of luci, https frontend, and ricci, secure daemon that
+dispatches incoming messages to underlying management modules.
This package contains Luci website.
@@ -123,6 +123,8 @@
%{_sysconfdir}/rc.d/init.d/luci
%{_sbindir}/luci_admin
%{_docdir}/luci-%{version}/
+%defattr(0755,root,root)
+ %{_libdir}/luci/
%defattr(-,luci,luci)
%{_localstatedir}/lib/luci
%{_libdir}/luci/ssl
@@ -132,10 +134,10 @@
%pre -n luci
if ! /bin/grep ^luci\:x /etc/group >&/dev/null; then
- /usr/sbin/groupadd -r -f luci >&/dev/null
+ /usr/sbin/groupadd -r -f luci >&/dev/null
fi
if ! /bin/grep ^luci\:x /etc/passwd >&/dev/null; then
- /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/luci -g luci luci >&/dev/null
+ /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/luci -g luci luci >&/dev/null
fi
%post -n luci
@@ -143,36 +145,37 @@
/sbin/service luci status >&/dev/null
LUCI_RUNNING=$?
if [ "$LUCI_RUNNING" == "0" ]; then
- /sbin/service luci stop >&/dev/null
+ /sbin/service luci stop >&/dev/null
fi
if [ -f /var/lib/luci/var/luci_backup.xml ]; then
- # restore luci database
- /usr/sbin/luci_admin restore >&/dev/null
+ # restore luci database
+ /usr/sbin/luci_admin restore >&/dev/null
fi
# set initial admin password (if not already set) to random value
grep True /var/lib/luci/.default_password_has_been_reset >&/dev/null
if [ $? -ne 0 ]; then
- /usr/sbin/luci_admin password --random >&/dev/null &&
- rm -f /var/lib/luci/var/Data.fs.index /var/lib/luci/var/Data.fs.tmp /var/lib/luci/var/Data.fs.old
+ /usr/sbin/luci_admin password --random >&/dev/null &&
+ rm -f /var/lib/luci/var/Data.fs.index /var/lib/luci/var/Data.fs.tmp /var/lib/luci/var/Data.fs.old
+ find %{_libdir}/luci/zope/var -print0 2>/dev/null | xargs -0 chown luci:
fi
if [ "$LUCI_RUNNING" == "0" ]; then
- /sbin/service luci start >&/dev/null
+ /sbin/service luci start >&/dev/null
fi
%preun -n luci
if [ "$1" == "0" ]; then
- /sbin/service luci stop >&/dev/null
- /sbin/chkconfig --del luci
+ /sbin/service luci stop >&/dev/null
+ /sbin/chkconfig --del luci
fi
/sbin/service luci status >&/dev/null
LUCI_RUNNING=$?
if [ "$LUCI_RUNNING" == "0" ]; then
- /sbin/service luci stop >&/dev/null
+ /sbin/service luci stop >&/dev/null
fi
/usr/sbin/luci_admin backup >&/dev/null
if [ "$LUCI_RUNNING" == "0" ]; then
- /sbin/service luci start >&/dev/null
+ /sbin/service luci start >&/dev/null
fi
@@ -210,12 +213,12 @@
Requires(postun): initscripts util-linux
%description -n ricci
-Conga is a project developing management system for remote stations.
-It consists of luci, https frontend, and ricci, secure daemon that dispatches
-incoming messages to underlying management modules.
+Conga is a project developing management system for remote stations.
+It consists of luci, https frontend, and ricci, secure daemon that dispatches
+incoming messages to underlying management modules.
-This package contains listening daemon (dispatcher), as well as
-reboot, rpm, storage, service and log management modules.
+This package contains listening daemon (dispatcher), as well as
+reboot, rpm, storage, service and log management modules.
%files -n ricci
@@ -248,10 +251,10 @@
%pre -n ricci
if ! /bin/grep ^ricci\:x /etc/group >&/dev/null; then
- /usr/sbin/groupadd -r -f ricci >&/dev/null
+ /usr/sbin/groupadd -r -f ricci >&/dev/null
fi
if ! /bin/grep ^ricci\:x /etc/passwd >&/dev/null; then
- /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/ricci -g ricci ricci >&/dev/null
+ /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/ricci -g ricci ricci >&/dev/null
fi
%post -n ricci
@@ -262,18 +265,18 @@
%preun -n ricci
if [ "$1" == "0" ]; then
- /sbin/service ricci stop >&/dev/null
- /sbin/chkconfig --del ricci
+ /sbin/service ricci stop >&/dev/null
+ /sbin/chkconfig --del ricci
fi
%postun -n ricci
if [ "$1" == "0" ]; then
- DBUS_PID=`cat /var/run/messagebus.pid 2>/dev/null`
- /bin/kill -s SIGHUP $DBUS_PID >&/dev/null
- /sbin/service oddjobd reload >&/dev/null
+ DBUS_PID=`cat /var/run/messagebus.pid 2>/dev/null`
+ /bin/kill -s SIGHUP $DBUS_PID >&/dev/null
+ /sbin/service oddjobd reload >&/dev/null
fi
if [ "$1" == "1" ]; then
- /sbin/service ricci condrestart >&/dev/null
+ /sbin/service ricci condrestart >&/dev/null
fi
@@ -283,9 +286,10 @@
### changelog ###
%changelog
-* Thu Jul 12 2007 Ryan McCabe <rmccabe@redhat.com> 0.10.0-2
+* Mon Jul 16 2007 Ryan McCabe <rmccabe@redhat.com> 0.10.0-2
- Fixed bz245202 (Conga needs to support Internet Explorer 6.0 and later)
-- Resolves: bz245202
+- Fixed bz248317 (luci sets incorrect permissions on /usr/lib64/luci and /var/lib/luci)
+- Resolves: bz245202 bz248317
%changelog
* Wed Jun 27 2007 Ryan McCabe <rmccabe@redhat.com> 0.10.0-1
@@ -396,7 +400,7 @@
- Fixed deleting cluster
- Fixed deleting node
- Fixed redirection for all async->busy wait calls
-- Storage module: properly probe cluster quorum if LVM locking
+- Storage module: properly probe cluster quorum if LVM locking
is marked as clustered
- Resolves: bz215039, bz215034, bz214790, bz213690, bz213266
- Resolves: bz213083, bz212601, bz212021, bz212006, bz212584
@@ -404,7 +408,7 @@
- Related: bz213306
* Wed Nov 01 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-23
-- 213504: luci does not correctly handle cluster.conf with
+- 213504: luci does not correctly handle cluster.conf with
nodes lacking FQDN
* Tue Oct 31 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-22
@@ -452,19 +456,19 @@
* Fri Aug 18 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-12
- Don't auto-start ricci after installation, do it manually
- Under certain circumstances, default luci password would not get reset
-- Many Luci improvements
+- Many Luci improvements
* Wed Aug 16 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-11.7
- Move ricci-modrpm, ricci-modlog, ricci-modstorage, ricci-modservice
- from /usr/sbin to /usr/libexec
+ from /usr/sbin to /usr/libexec
* Wed Aug 09 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-11
-- Spin off clustermon.srpm (modcluster, cluster-snmp and
- cluster-cim) from conga.srpm
+- Spin off clustermon.srpm (modcluster, cluster-snmp and
+ cluster-cim) from conga.srpm
- Luci: tighten down security
* Thu Aug 03 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-10
-- Luci: fix login issues, add cluster resources, styling...
+- Luci: fix login issues, add cluster resources, styling...
* Wed Jul 26 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-9
- Update Luci to Plone 2.5
@@ -477,7 +481,7 @@
- More compliant specfile, minor fixes
* Tue Jun 27 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-6
-- Luci persists users/clusters/systems/permissions across upgrades
+- Luci persists users/clusters/systems/permissions across upgrades
* Fri Jun 16 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-4
- Moved storage, service, log and rpm modules into main ricci.rpm
reply other threads:[~2007-07-16 21:06 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070716210615.32279.qmail@sourceware.org \
--to=rmccabe@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.