[cfengine] Update to cfengine 3.x
Jeff Sheltren
sheltren at fedoraproject.org
Fri Oct 1 13:47:41 UTC 2010
commit 4e87adb7fac344ea98bda0dd9a1a6c63d04c73d4
Author: Jeff Sheltren <jeff at osuosl.org>
Date: Fri Oct 1 06:45:52 2010 -0700
Update to cfengine 3.x
.gitignore | 1 +
cfexecd => cf-execd | 18 ++--
cfenvd => cf-monitord | 14 +-
cfservd => cf-serverd | 20 ++--
cfengine-shellcommands-allclasses-svn_r629.patch | 157 ----------------------
cfengine.spec | 82 ++++++------
sources | 2 +-
7 files changed, 69 insertions(+), 225 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 106466d..225886d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
cfengine-2.2.10.tar.gz
+/cfengine-3.0.5p1.tar.gz
diff --git a/cfexecd b/cf-execd
similarity index 73%
rename from cfexecd
rename to cf-execd
index 7619ebe..681f1ca 100644
--- a/cfexecd
+++ b/cf-execd
@@ -1,17 +1,17 @@
#!/bin/bash
#
-# cfexecd Start/Stop the cfengine client daemon.
+# cf-execd Start/Stop the cfengine client daemon.
#
# chkconfig: - 98 20
-# description: cfexecd is scheduler and reporter in cfengine client hosts.
+# description: cf-execd is scheduler and reporter in cfengine client hosts.
# For more information, visit http://www.cfengine.org
-# processname: cfexecd
+# processname: cf-execd
# config: /var/cfengine/inputs
# Source function library.
. /etc/init.d/functions
-exec="/usr/sbin/cfexecd"
+exec="/usr/sbin/cf-execd"
prog=$(basename $exec)
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
@@ -34,25 +34,25 @@ stop() {
echo
[ $RETVAL -eq 0 ] && rm -f $lockfile
return $RETVAL
-}
+}
restart() {
stop
start
-}
+}
reload() {
restart
}
-
+
force_reload() {
restart
}
-
+
fdrstatus() {
status $prog
-}
+}
case "$1" in
start|stop|restart|reload)
diff --git a/cfenvd b/cf-monitord
old mode 100755
new mode 100644
similarity index 83%
rename from cfenvd
rename to cf-monitord
index 63b4618..1d69921
--- a/cfenvd
+++ b/cf-monitord
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# cfenvd: Starts the GNU cfengine environment daemon
+# cf-monitord: Starts the GNU cfengine environment daemon
#
# chkconfig: - 15 85
# description: This process maintains state information about the client
@@ -10,13 +10,13 @@
# deviation from what has been measured over a long period of time
# (2 months or more) to be normal or average activity.
#
-# processname: cfenvd
+# processname: cf-monitord
#
# Source function library.
. /etc/rc.d/init.d/functions
-exec="/usr/sbin/cfenvd"
+exec="/usr/sbin/cf-monitord"
prog=$(basename $exec)
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
@@ -43,19 +43,19 @@ stop() {
restart() {
stop
start
-}
+}
reload() {
restart
}
-
+
force_reload() {
restart
}
-
+
fdrstatus() {
status $prog
-}
+}
case "$1" in
start|stop|restart|reload)
diff --git a/cfservd b/cf-serverd
similarity index 76%
rename from cfservd
rename to cf-serverd
index 1e505be..5fa0ae4 100644
--- a/cfservd
+++ b/cf-serverd
@@ -1,18 +1,18 @@
#!/bin/bash
#
-# cfservd Start/Stop the cfengine server daemon.
+# cf-serverd Start/Stop the cfengine server daemon.
#
# chkconfig: - 96 20
-# description: cfservd is responsible from giving out configuration files to
+# description: cf-serverd is responsible from giving out configuration files to
# those cfengine clients, who wish to update their configs.
# For more information, visit http://www.cfengine.org
-# processname: cfservd
+# processname: cf-serverd
# config: /var/cfengine/masterfiles
# Source function library.
. /etc/init.d/functions
-exec="/usr/sbin/cfservd"
+exec="/usr/sbin/cf-serverd"
prog=$(basename $exec)
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
@@ -20,7 +20,7 @@ prog=$(basename $exec)
lockfile=/var/lock/subsys/$prog
# See how we were called.
-
+
start() {
[ ! -f /var/cfengine/ppkeys/localhost.priv ] && /usr/sbin/cfkey
echo -n $"Starting $prog: "
@@ -38,24 +38,24 @@ stop() {
echo
[ $RETVAL -eq 0 ] && rm -f $lockfile
return $RETVAL
-}
+}
restart() {
stop
start
-}
+}
reload() {
restart
}
-
+
force_reload() {
restart
}
-
+
fdrstatus() {
status $prog
-}
+}
case "$1" in
start|stop|restart|reload)
diff --git a/cfengine.spec b/cfengine.spec
index 9cee12f..ae45b0e 100644
--- a/cfengine.spec
+++ b/cfengine.spec
@@ -1,17 +1,16 @@
Summary: A systems administration tool for networks
Name: cfengine
-Version: 2.2.10
-Release: 6%{?dist}
-License: GPLv2+
+Version: 3.0.5p1
+Release: 1%{?dist}
+License: GPLv3
Group: Applications/System
-Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.2.10.tar.gz
-Source1: cfexecd
-Source2: cfservd
-Source3: cfenvd
-Patch0: cfengine-shellcommands-allclasses-svn_r629.patch
+Source0: http://www.cfengine.org/tarballs/cfengine-3.0.5p1.tar.gz
+Source1: cf-execd
+Source2: cf-serverd
+Source3: cf-monitord
URL: http://www.cfengine.org/
BuildRequires: db4-devel,openssl-devel,bison,flex,m4,libacl-devel
-BuildRequires: libselinux-devel,tetex-dvips,texinfo-tex
+BuildRequires: libselinux-devel,tetex-dvips,texinfo-tex,pcre-devel
Requires(post): /sbin/chkconfig, /sbin/install-info
Requires(preun): /sbin/chkconfig, /sbin/install-info, /sbin/service
Requires(postun): /sbin/service
@@ -38,15 +37,13 @@ This package contains the documentation for cfengine.
%prep
%setup -q
-%patch0 -p0 -b .shellcommands
%build
-%configure BERKELEY_DB_LIB=-ldb --with-docs --enable-selinux
+%configure BERKELEY_DB_LIB=-ldb \
+ --with-docs --docdir=%{_defaultdocdir}/%{name}-%{version} \
+ --enable-selinux
make
-# Some of the example files have execute bit set
-chmod 644 inputs/*example
-chmod 644 contrib/cfdoc
%install
@@ -59,17 +56,19 @@ make DESTDIR=$RPM_BUILD_ROOT install
mkdir -p $RPM_BUILD_ROOT%{_var}/%{name}
for i in ppkeys inputs outputs
do
- mkdir -m 0700 $RPM_BUILD_ROOT%{_var}/%{name}/$i
+ mkdir -m 0700 $RPM_BUILD_ROOT%{_var}/%{name}/$i
done
# It's ugly, but thats the way Mark wants to have it. :(
# If we don't create this link, cfexecd will not be able to start
-# (hardcoded) /var/sbin/cfagent in scheduled intervals. Other option
-# would be to patch cfengine to use %{_sbindir}/cfagent
+# (hardcoded) /var/sbin/cf-agent in scheduled intervals. Other option
+# would be to patch cfengine to use %{_sbindir}/cf-agent
+# but upstream won't support this
mkdir -p $RPM_BUILD_ROOT/%{_var}/%{name}/bin
-ln -sf %{_sbindir}/cfagent $RPM_BUILD_ROOT/%{_var}/%{name}/bin/
+ln -sf %{_sbindir}/cf-agent $RPM_BUILD_ROOT/%{_var}/%{name}/bin/
+ln -sf %{_sbindir}/cf-promises $RPM_BUILD_ROOT/%{_var}/%{name}/bin/
-# Startup file for cfexecd and cfservd
+# init scripts
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
for i in %{SOURCE1} %{SOURCE2} %{SOURCE3}
do
@@ -86,33 +85,33 @@ rm -f $RPM_BUILD_ROOT%{_sbindir}/cfdoc
%post
# cfagent won't run nicely, unless your host has keys.
if [ ! -d /mnt/sysimage -a ! -f %{_var}/%{name}/ppkeys/localhost.priv ]; then
- %{_sbindir}/cfkey >/dev/null || :
+ %{_sbindir}/cf-key >/dev/null || :
fi
/sbin/install-info --info-dir=%{_infodir} %{_infodir}/cfengine*.info* 2> /dev/null || :
# add init files to chkconfig
if [ "$1" = "1" ]; then
- /sbin/chkconfig --add cfenvd
- /sbin/chkconfig --add cfexecd
- /sbin/chkconfig --add cfservd
+ /sbin/chkconfig --add cf-monitord
+ /sbin/chkconfig --add cf-execd
+ /sbin/chkconfig --add cf-serverd
fi
%preun
if [ "$1" = "0" ]; then
/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cfengine*.info* 2> /dev/null || :
- /sbin/service cfenvd stop >/dev/null 2>&1 || :
- /sbin/service cfexecd stop >/dev/null 2>&1 || :
- /sbin/service cfservd stop >/dev/null 2>&1 || :
- /sbin/chkconfig --del cfenvd
- /sbin/chkconfig --del cfexecd
- /sbin/chkconfig --del cfservd
+ /sbin/service cf-monitord stop >/dev/null 2>&1 || :
+ /sbin/service cf-execd stop >/dev/null 2>&1 || :
+ /sbin/service cf-serverd stop >/dev/null 2>&1 || :
+ /sbin/chkconfig --del cf-monitord
+ /sbin/chkconfig --del cf-execd
+ /sbin/chkconfig --del cf-serverd
fi
%postun
if [ $1 -ge 1 ]; then
- /sbin/service cfenvd condrestart >/dev/null 2>&1 || :
- /sbin/service cfexecd condrestart >/dev/null 2>&1 || :
- /sbin/service cfservd condrestart >/dev/null 2>&1 || :
+ /sbin/service cf-monitord condrestart >/dev/null 2>&1 || :
+ /sbin/service cf-execd condrestart >/dev/null 2>&1 || :
+ /sbin/service cf-serverd condrestart >/dev/null 2>&1 || :
fi
@@ -124,25 +123,26 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
%{_sbindir}/*
-%{_libdir}/libcfengine*
+%{_libdir}/libpromises*
%{_mandir}/man8/*
-%{_initrddir}/cfenvd
-%{_initrddir}/cfexecd
-%{_initrddir}/cfservd
+%{_initrddir}/cf-monitord
+%{_initrddir}/cf-execd
+%{_initrddir}/cf-serverd
%{_var}/%{name}
%files doc
%defattr(-,root,root,-)
-%{_infodir}/cfengine*
-%doc contrib
%doc inputs
-%doc doc/*html
-%doc doc/*pdf
-%doc doc/*ps
+%doc docs/*html
+%doc docs/*pdf
%changelog
+* Thu Sep 30 2010 Jeff Sheltren <jeff at osuosl.org> - 3.0.5p1-1
+- Update for cfengine 3
+- Now buildrequires pcre-devel
+
* Tue Feb 23 2010 Jeff Sheltren <jeff at osuosl.org> - 2.2.10-6
- Rebuild for new db4
diff --git a/sources b/sources
index 6dc9f03..eb97ec5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3b90ff8bf2ec941cd33cfb65f5012f16 cfengine-2.2.10.tar.gz
+b74af23928253e11dcce3d98510f1066 cfengine-3.0.5p1.tar.gz
More information about the scm-commits
mailing list