Accepting request 145425 from systemsmanagement

- update to 3.4.1 final remove cfengine-3.4.0.patch, was accepted upstream 3.4.1 (Bugfix and Stability release) New feature/behavior: - cf-execd terminates agent processes that are not responsive for a configurable amount of time (see agent_expireafter in body executor control), defaulting to 1 week Bugfixes: - fix regression of classmatch() failing with hard classes (Redmine #1834) - create promise-defined and persistent classes in correct namespace (Redmine #1836) - several fixes to namespace support - fix several crash bugs caused by buffer overflow and race conditions in cf-serverd - regenerate time classes in cf-execd for each run (Redmine #1838) - edit_xml: fix select_xpath implementation and update documentation NOTE: code that uses select_xpath_region needs to be changed to select_xpath - edit_xml: make sure that text-modification functions don't overwrite child nodes - edit_xml: improve error logging OBS-URL: https://build.opensuse.org/request/show/145425 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cfengine?expand=0&rev=29
2012-12-17 08:33:21 +00:00 · 2012-12-17 08:33:21 +00:00 · d30578356e
commit d30578356e
parent f757994474 5c4092ab3d
5 changed files with 45 additions and 38 deletions
--- a/cfengine-3.4.0.patch
+++ b/cfengine-3.4.0.patch
@ -1,24 +0,0 @@
-diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-cfengine-3.4.0/src/files_select.c ./src/files_select.c
--- ../orig-cfengine-3.4.0/src/files_select.c	2012-11-26 12:13:20.000000000 +0100
-+++ ./src/files_select.c	2012-11-29 09:15:53.859129139 +0100
-@@ -285,7 +285,7 @@
- 
- #ifndef MINGW                   // no uids on Windows
-     char buffer[CF_SMALLBUF];
-    snprintf(buffer, CF_BUFSIZE, "%jd", (uintmax_t) lstatptr->st_uid);
-+    snprintf(buffer, CF_SMALLBUF, "%jd", (uintmax_t) lstatptr->st_uid);
-     PrependAlphaList(&leafattrib, buffer);
- #endif /* MINGW */
- 
-diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-cfengine-3.4.0/src/server.c ./src/server.c
--- ../orig-cfengine-3.4.0/src/server.c	2012-11-26 12:13:20.000000000 +0100
-+++ ./src/server.c	2012-11-29 08:49:31.871817185 +0100
-@@ -2367,7 +2367,7 @@
- 
-     if (strlen(ReadLastNode(filename)) > CF_MAXLINKSIZE)
-     {
-        snprintf(sendbuffer, CF_BUFSIZE * 2, "BAD: Filename suspiciously long [%s]\n", filename);
-+        snprintf(sendbuffer, CF_BUFSIZE, "BAD: Filename suspiciously long [%s]\n", filename);
-         CfOut(cf_error, "", "%s", sendbuffer);
-         SendTransaction(conn->sd_reply, sendbuffer, 0, CF_DONE);
-         return -1;
--- a/cfengine-3.4.0.tar.bz2
+++ b/cfengine-3.4.0.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:75c113b37988529634237b3bc349aa69dfcb3c69ed92f649a0e6f2e97d72b025
-size 4263916
--- a/cfengine-3.4.1.tar.bz2
+++ b/cfengine-3.4.1.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9967394eefe231826ecf1b2f124217ecf201c92cf5beb9eec23b0116dd3ee84a
+size 4271718
--- a/cfengine.changes
+++ b/cfengine.changes
@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+Fri Dec 14 08:06:06 UTC 2012 - kkaempf@suse.com
+
+- update to 3.4.1 final
+  remove cfengine-3.4.0.patch, was accepted upstream
+
+  3.4.1   (Bugfix and Stability release)
+
+  New feature/behavior:
+  - cf-execd terminates agent processes that are not responsive
+    for a configurable amount of time (see agent_expireafter in
+    body executor control), defaulting to 1 week
+
+  Bugfixes:
+  - fix regression of classmatch() failing with hard classes
+    (Redmine #1834)
+  - create promise-defined and persistent classes in correct
+    namespace (Redmine #1836)
+  - several fixes to namespace support
+  - fix several crash bugs caused by buffer overflow and race
+    conditions in cf-serverd
+  - regenerate time classes in cf-execd for each run
+    (Redmine #1838)
+  - edit_xml: fix select_xpath implementation and update
+    documentation
+    NOTE: code that uses select_xpath_region needs to be changed
+          to select_xpath
+  - edit_xml: make sure that text-modification functions don't
+    overwrite child nodes
+  - edit_xml: improve error logging
+
 -------------------------------------------------------------------
 Thu Nov 29 07:48:20 UTC 2012 - kkaempf@suse.com

--- a/cfengine.spec
+++ b/cfengine.spec
@ -21,18 +21,17 @@ Name:           cfengine
 %define         libsoname %{libname}1

 # Yes, its not FHS conformant but in sync with cfengine documentation
+# reported upstream as https://cfengine.com/dev/issues/1896
 %define         basedir   /var/%{name}
 %define         workdir   %{basedir}

 Summary:        CFEngine automates large-scale IT computing infrastructure
 License:        GPL-3.0
 Group:          Productivity/Networking/System
-Version:        3.4.0
+Version:        3.4.1
 Release:        0
 Url:            http://www.cfengine.org/
 Source:         %{name}-%{version}.tar.bz2
-# fix possible buffer overflows, reported upstream, kkaempf@suse.de
-Patch:          %{name}-%{version}.patch
 Source1:        http://www.cfengine.org/manuals/cf3-Reference.pdf
 Source2:        http://www.cfengine.org/manuals/cf3-conceptguide.pdf
 Source3:        http://www.cfengine.org/manuals/cf3-glossary.pdf
@ -84,7 +83,7 @@ BuildRequires:  systemd
 %endif

 %description
-CFEngine automates large-scale IT computing infrastructure: ensuring
+CFEngine is the core of a configuration management system: ensuring
 the availability, security and compliance of mission-critical
 applications and services. Based on popular and flexible open source
 configuration management software, CFEngine configuration management
@ -139,8 +138,6 @@ This package contains the files of the cfengine server.

 %prep
 %setup -q
-# Buffer overflow at server.c:2362
-%patch -p1
 ##### rpmlint
 #### wrong-file-end-of-line-encoding
 #### incorrect-fsf-address
@ -162,9 +159,12 @@ CC=gcc CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
  --with-workdir=%{workdir}
 %{__make} %{?_smp_mflags}

-# --datadir=/var/lib/%{name}/inputs \
+# --datadir=/var/lib/%%{name}/inputs \

 %install
+
+chmod -x ChangeLog
+
 %if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora_version}
 [ -d %{buildroot} ] && [ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
 %endif
@ -173,7 +173,7 @@ CC=gcc CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \

 # create dirs needed for better organizing dirs and files
 %{__install} -d %{buildroot}/%{basedir}/{backup,failsafe,config}
-#%{__install} -d %{buildroot}/%{basedir}/config/{development,production}
+#%%{__install} -d %{buildroot}/%%{basedir}/config/{development,production}

 # install cron file
 %{__install} -D -m0644 %{S:10} %{buildroot}/%{_sysconfdir}/cron.d/%{name}
@ -207,7 +207,7 @@ for i in cf-agent cf-execd cf-key cf-monitord cf-promises cf-report cf-runagent
  %{__ln_s} -f ../../..%{_sbindir}/${i} %{buildroot}%{workdir}/bin/${i}
 done

-# Install masterfiles (as %config(noreplace) )
+# Install masterfiles (as %%config(noreplace) )
 %{__install} -d %{buildroot}/%{basedir}/masterfiles
 %{__install} -m 0644 masterfiles/def.cf %{buildroot}/%{basedir}/masterfiles
 %{__install} -m 0644 masterfiles/promises.cf %{buildroot}/%{basedir}/masterfiles
@ -216,7 +216,7 @@ done

 rm -rf %{buildroot}/%{_libdir}/%{name}/libpromises.la

-# will appear in %docdir
+# will appear in %%docdir
 rm -rf %{buildroot}/%{_datadir}/%{name}/ChangeLog
 rm -rf %{buildroot}/%{_datadir}/%{name}/README

@ -349,7 +349,7 @@ fi
 /var/%{name}
 %exclude %{basedir}/backup
 %exclude %{basedir}/config
-#%exclude %{basedir}/failsafe
+#%%exclude %%{basedir}/failsafe

 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*