From ddeddb39d2830a3fb270ae4c46f042a5a4413a8f932ea4fe5fe9dae66276005a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.com>
Date: Fri, 14 Dec 2012 08:07:06 +0000
Subject: [PATCH] - update to 3.4.1 final   remove cfengine-3.4.0.patch, was
 accepted upstream

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/cfengine?expand=0&rev=30
---
 cfengine-3.4.0.patch   | 24 ------------------------
 cfengine-3.4.0.tar.bz2 |  3 ---
 cfengine-3.4.1.tar.bz2 |  3 +++
 cfengine.changes       |  6 ++++++
 cfengine.spec          |  6 +-----
 5 files changed, 10 insertions(+), 32 deletions(-)
 delete mode 100644 cfengine-3.4.0.patch
 delete mode 100644 cfengine-3.4.0.tar.bz2
 create mode 100644 cfengine-3.4.1.tar.bz2

diff --git a/cfengine-3.4.0.patch b/cfengine-3.4.0.patch
deleted file mode 100644
index 948b244..0000000
--- a/cfengine-3.4.0.patch
+++ /dev/null
@@ -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;
diff --git a/cfengine-3.4.0.tar.bz2 b/cfengine-3.4.0.tar.bz2
deleted file mode 100644
index b5db3ed..0000000
--- a/cfengine-3.4.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:75c113b37988529634237b3bc349aa69dfcb3c69ed92f649a0e6f2e97d72b025
-size 4263916
diff --git a/cfengine-3.4.1.tar.bz2 b/cfengine-3.4.1.tar.bz2
new file mode 100644
index 0000000..eef18f1
--- /dev/null
+++ b/cfengine-3.4.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9967394eefe231826ecf1b2f124217ecf201c92cf5beb9eec23b0116dd3ee84a
+size 4271718
diff --git a/cfengine.changes b/cfengine.changes
index 89adad9..28319c0 100644
--- a/cfengine.changes
+++ b/cfengine.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+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
+
 -------------------------------------------------------------------
 Thu Nov 29 07:48:20 UTC 2012 - kkaempf@suse.com
 
diff --git a/cfengine.spec b/cfengine.spec
index 0d3586f..c83cb60 100644
--- a/cfengine.spec
+++ b/cfengine.spec
@@ -27,12 +27,10 @@ Name:           cfengine
 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
@@ -139,8 +137,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