Hello community, here is the log from the commit of package cfengine for openSUSE:Factory checked in at 2012-03-08 19:42:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cfengine (Old) and /work/SRC/openSUSE:Factory/.cfengine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cfengine", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/cfengine/cfengine.changes 2011-10-11 16:51:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cfengine.new/cfengine.changes 2012-03-08 19:42:35.000000000 +0100 @@ -1,0 +2,61 @@ +Wed Feb 15 13:49:18 UTC 2012 - [email protected] + +- update to 3.2.4 + * Fixed failure in network transfer in case of misbehaving peer + * A few tiny memory leaks on error paths fixed +- fix post/-un for SLE_10 (install_info) +- fix deps for SLE_10 + * {libsoname} Req glibc +- provide default *.cf files in inputs DIR + otherwise init scripts will fail + +------------------------------------------------------------------- +Wed Feb 8 15:03:01 UTC 2012 - [email protected] + +- fix pre/post scripts + * RHEL/CentOS does not know "SuSE macros" :( + +------------------------------------------------------------------- +Tue Feb 7 12:20:19 UTC 2012 - [email protected] + +- fix deps for CentOS/RHEL (cron) + * Req vixie-cron + +------------------------------------------------------------------- +Mon Jan 30 09:26:01 UTC 2012 - [email protected] + +- fix cron file + +------------------------------------------------------------------- +Wed Jan 25 15:52:31 UTC 2012 - [email protected] + +- change workdir to /var/lib/cfengine/work + * adapt init scripts + * add new dirs + o /var/lib/cfengine/{backup,failsafe,config} +- add cron file as Source10 + +------------------------------------------------------------------- +Tue Jan 24 14:27:49 UTC 2012 - [email protected] + +- move "server" stuff to subpkg + +------------------------------------------------------------------- +Fri Jan 13 13:34:32 UTC 2012 - [email protected] + +- fix init scripts + * check for existing "promises.cf, failsafe.cf" +- create symlinks for sbin_PROGRAMS + +------------------------------------------------------------------- +Tue Nov 15 15:02:19 UTC 2011 - [email protected] + +- update to 3.2.3 + * A few tiny memory leaks fixed + * Improved performance of cf-serverd under heavy load with + TokyoCabinet database + * Full list of issues fixed is available on + https://cfengine.com/bugtracker/changelog_page.php +- fix License: GPLv2+ -> GPLv3 + +------------------------------------------------------------------- Old: ---- cfengine-3.2.1.tar.gz New: ---- cfengine-3.2.4.tar.gz cfengine.cron ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cfengine.spec ++++++ --- /var/tmp/diff_new_pack.OJQXz3/_old 2012-03-08 19:42:38.000000000 +0100 +++ /var/tmp/diff_new_pack.OJQXz3/_new 2012-03-08 19:42:38.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package cfengine # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,22 +16,24 @@ # - Name: cfengine %define libname libpromises %define libsoname %{libname}1 +%define basedir /var/lib/%{name} +%define workdir %{basedir}/work Summary: A Tool to Maintain Complicated Networks -Version: 3.2.1 -Release: 1 -License: GPLv2+ +License: GPL-3.0 Group: Productivity/Networking/System +Version: 3.2.4 +Release: 0 Url: http://www.cfengine.org/ Source: %{name}-%{version}.tar.gz Source1: http://www.cfengine.org/manuals/cf3-Reference.pdf Source2: cf-monitord Source3: cf-execd Source4: cf-serverd +Source10: %{name}.cron BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison BuildRequires: db-devel @@ -41,6 +43,11 @@ BuildRequires: openssl-devel BuildRequires: pcre-devel BuildRequires: postgresql-devel +%if 0%{?centos_version} || 0%{?rhel_version} +Requires: vixie-cron +%else +Requires: cron +%endif %if 0%{?suse_version} PreReq: %install_info_prereq @@ -56,6 +63,9 @@ %package -n %{libsoname} Summary: Shared library of cfengine Group: System/Libraries +%if 0%{?suse_version} == 1010 +Requires: glibc +%endif %description -n %{libsoname} This package contains the shared libpromises (cfengine) library. @@ -77,12 +87,22 @@ Group: Productivity/Networking/System %if 0%{?rhel_version} || 0%{?centos_version} BuildRequires: texinfo -BuildRequires: tetex tetex-dvips tetex-latex +BuildRequires: tetex +BuildRequires: tetex-dvips +BuildRequires: tetex-latex %endif %description doc Full documentation for cfengine +%package server +Summary: Files needed for cfengine server +Group: Productivity/Networking/System +Requires: %{name} = %{version}-%{release} + +%description server +This package contains the files of the cfengine server. + %prep %setup -q @@ -92,6 +112,15 @@ ### http://www.fsf.org/about/contact/ find ./examples -type f -name "*.cf" -exec perl -p -i -e 's|\r\n|\n|,s|^# Foundation.*|# Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA|' {} \; +### FIXME +# there are 3 different cfengine_stdlib.cf +## as of 3.2.4 +# ./examples/cfengine_stdlib.cf - Rev: 95 +# ./examples/example_config/cfengine_stdlib.cf - Rev: 61 +# ./masterfiles/cfengine_stdlib.cf - Rev: 84 +%{__cp} -a ./examples/cfengine_stdlib.cf ./examples/example_config/ +%{__cp} -a ./examples/cfengine_stdlib.cf ./masterfiles/ + %build %if 0%{?suse_version} %{suse_update_config -f} @@ -100,8 +129,9 @@ CC=gcc CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ %configure \ --disable-static \ + --datadir=/var/lib \ --docdir=%{_docdir}/%{name} \ - --with-workdir=/var/lib/%{name} + --with-workdir=%{workdir} %{__make} %{?_smp_mflags} # --datadir=/var/lib/%{name}/inputs \ @@ -111,17 +141,40 @@ [ -d %{buildroot} ] && [ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} %endif %{__make} "DESTDIR=%{buildroot}" install -%{__install} -d %{buildroot}/{usr/sbin,etc/init.d,/var/lib/%{name}/bin} +%{__install} -d %{buildroot}/{usr/sbin,etc/init.d,%{workdir}/{bin,inputs}} + +# create dirs needed for better organizing dirs and files +%{__install} -d %{buildroot}/%{basedir}/{backup,failsafe,config} +#%{__install} -d %{buildroot}/%{basedir}/config/{development,production} # install missing AUTHORS LICENSE {S:1} %{__install} -m0644 AUTHORS LICENSE %{S:1} %{buildroot}/%{_docdir}/%{name}/ +# install cron file +%{__install} -D -m0644 %{S:10} %{buildroot}/%{_sysconfdir}/cron.d/%{name} + # install init scripts %{__install} -m 0755 %{S:2} %{S:3} %{S:4} %{buildroot}/etc/init.d/ %{__ln_s} -f ../../etc/init.d/cf-monitord %{buildroot}/%{_sbindir}/rccf-monitord %{__ln_s} -f ../../etc/init.d/cf-execd %{buildroot}/%{_sbindir}/rccf-execd %{__ln_s} -f ../../etc/init.d/cf-serverd %{buildroot}/%{_sbindir}/rccf-serverd -%{__ln_s} -f ../../../..%{_sbindir}/cf-promises %{buildroot}/var/lib/%{name}/bin/cf-promises +# sed @workdir@ in initscripts/cron.d +sed -i\ + -e "s,@workdir@,%{workdir},g"\ + -e "s,@basedir@,%{basedir},g" \ + %{buildroot}/etc/init.d/cf-* %{buildroot}/etc/cron.d/%{name} + +# create symlinks for sbin_PROGRAMS +for i in cf-agent cf-execd cf-key cf-know cf-monitord cf-promises cf-report cf-runagent cf-serverd; do + %{__ln_s} -f ../../../../..%{_sbindir}/${i} %{buildroot}%{workdir}/bin/${i} +done + +# mv all masterfiles/*.cf to masterfiles/*.cf.default +pushd %{buildroot}%{basedir}/masterfiles +for j in $(ls -1); do + cp -a * ../work/inputs/ + mv ${j} ${j}.default +done ## FIXME: what is the purpose of theses libs ? ## are they really needed ? @@ -129,37 +182,57 @@ #{__rm} -rf %{buildroot}/%{_libdir}/libpromises.a %preun +%if 0%{?suse_version} %stop_on_removal cf-monitord -%stop_on_removal cf-serverd %stop_on_removal cf-execd +%else +/etc/init.d/cf-execd stop +/etc/init.d/cf-monitord stop +%endif %post -%if 0%{?suse_version} %if 0%{?suse_version} > 1010 %install_info --name=%{name} --info-dir=%{_infodir} %{_infodir}/cf3-reference.info.gz -%else -: -%endif -%else -%install_info --info-dir=%{_infodir} %{_infodir}/cf3-reference.info.gz %endif /sbin/ldconfig %postun -%if 0%{?suse_version} %if 0%{?suse_version} > 1010 %install_info_delete --name=%{name} --info-dir=%{_infodir} %{_infodir}/cf3-reference.info.gz +%insserv_cleanup + for i in execd monitord; do + %restart_on_update cf-${i} + done %else + # Update ? + if [ ${1:-0} -eq 1 ]; then + for i in execd monitord; do + /etc/init.d/cf-${i} restart + done + else : + fi %endif +/sbin/ldconfig + +%preun server +%if 0%{?suse_version} +%stop_on_removal cf-serverd %else -%install_info_delete --info-dir=%{_infodir} %{_infodir}/cf3-reference.info.gz +/etc/init.d/cf-serverd stop +%endif + +%postun server +%if 0%{?suse_version} +%restart_on_update cf-serverd +%else + # Update ? + if [ ${1:-0} -eq 1 ]; then + /etc/init.d/cf-serverd restart + else +: + fi %endif -%insserv_cleanup -/sbin/ldconfig -for i in execd monitord serverd; do - %restart_on_update cf-${i} -done %post -n %{libsoname} -p /sbin/ldconfig @@ -174,11 +247,20 @@ %exclude %{_docdir}/%{name}/example_config %exclude %{_docdir}/%{name}/examples /usr/sbin/* -%{_datadir}/%{name} +%exclude /usr/sbin/cf-serverd +%exclude /usr/sbin/rccf-serverd %{_mandir}/man?/* -%dir /var/lib/%{name} -/var/lib/%{name}/* +%dir %{basedir} +%{basedir} +#%dir %{workdir} +#%{workdir}/* +%exclude %{basedir}/backup +%exclude %{basedir}/config +#%exclude %{basedir}/failsafe +%exclude %{workdir}/bin/cf-serverd +%config(noreplace) /etc/cron.d/%{name} %config %attr(0755,root,root) /etc/init.d/* +%exclude /etc/init.d/cf-serverd %files -n %{libsoname} %defattr(-,root,root) @@ -194,4 +276,13 @@ %{_docdir}/%{name} %exclude %{_docdir}/%{name}/LICENSE +%files server +%defattr(-,root,root) +%{basedir}/backup +%{basedir}/config +/usr/sbin/cf-serverd +/usr/sbin/rccf-serverd +%{workdir}/bin/cf-serverd +/etc/init.d/cf-serverd + %changelog ++++++ cf-execd ++++++ --- /var/tmp/diff_new_pack.OJQXz3/_old 2012-03-08 19:42:38.000000000 +0100 +++ /var/tmp/diff_new_pack.OJQXz3/_new 2012-03-08 19:42:38.000000000 +0100 @@ -69,6 +69,18 @@ ## Read config #. $FOO_CONFIG +## Check for promises file +CF_PROMISES=@workdir@/inputs/promises.cf +test -r $CF_PROMISES || { echo "$CF_PROMISES not existing"; + if [ "$1" = "stop" ]; then exit 0; + else exit 6; fi; } + +## Check for failsafe file +CF_FAILSAFE=@workdir@/inputs/failsafe.cf +test -r $CF_FAILSAFE || { echo "$CF_FAILSAFE not existing"; + if [ "$1" = "stop" ]; then exit 0; + else exit 6; fi; } + # some VARS CF_PIDFILE="/var/run/cf-execd.pid" SVC_NAME="cfengine's execution agent" ++++++ cf-monitord ++++++ --- /var/tmp/diff_new_pack.OJQXz3/_old 2012-03-08 19:42:38.000000000 +0100 +++ /var/tmp/diff_new_pack.OJQXz3/_new 2012-03-08 19:42:38.000000000 +0100 @@ -70,6 +70,18 @@ ## Read config #. $FOO_CONFIG +## Check for promises file +CF_PROMISES=@workdir@/inputs/promises.cf +test -r $CF_PROMISES || { echo "$CF_PROMISES not existing"; + if [ "$1" = "stop" ]; then exit 0; + else exit 6; fi; } + +## Check for failsafe file +CF_FAILSAFE=@workdir@/inputs/failsafe.cf +test -r $CF_FAILSAFE || { echo "$CF_FAILSAFE not existing"; + if [ "$1" = "stop" ]; then exit 0; + else exit 6; fi; } + # some VARS CF_PIDFILE="/var/run/cf-monitord.pid" SVC_NAME="cfengine's monitoring agent" ++++++ cf-serverd ++++++ --- /var/tmp/diff_new_pack.OJQXz3/_old 2012-03-08 19:42:38.000000000 +0100 +++ /var/tmp/diff_new_pack.OJQXz3/_new 2012-03-08 19:42:38.000000000 +0100 @@ -69,6 +69,18 @@ ## Read config #. $FOO_CONFIG +## Check for promises file +CF_PROMISES=@workdir@/inputs/promises.cf +test -r $CF_PROMISES || { echo "$CF_PROMISES not existing"; + if [ "$1" = "stop" ]; then exit 0; + else exit 6; fi; } + +## Check for failsafe file +CF_FAILSAFE=@workdir@/inputs/failsafe.cf +test -r $CF_FAILSAFE || { echo "$CF_FAILSAFE not existing"; + if [ "$1" = "stop" ]; then exit 0; + else exit 6; fi; } + # some VARS CF_PIDFILE="/var/run/cf-serverd.pid" SVC_NAME="cfengine's server agent" ++++++ cfengine-3.2.1.tar.gz -> cfengine-3.2.4.tar.gz ++++++ ++++ 25746 lines of diff (skipped) ++++++ cfengine.cron ++++++ # This cron will start cf-agent if not yet running # and it would repair via failsafe a broken cfengine config # #15 */2 * * * root @workdir@/bin/cf-agent || @basedir@/failsafe/bin/cf-failsafe.sh -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
