From 1483b9e29c997f62dc97fabd0bbd2da1ee9c4e044a9697d5f0317c9a1db7879b Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 23 Jul 2010 15:17:11 +0000 Subject: [PATCH] Accepting request 43609 from devel:tools:building checked in (request 43609) OBS-URL: https://build.opensuse.org/request/show/43609 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=64 --- cmake-2.8.1.tar.bz2 | 3 +++ cmake-2.8.2.tar.bz2 | 3 --- cmake-disable-builtin-chrpath.diff | 6 +++--- cmake-gui.changes | 7 ------- cmake-gui.spec | 4 ++-- cmake.changes | 14 -------------- cmake.spec | 4 ++-- fortify-buffer-overflows.diff | 22 +++++++++++++++++----- 8 files changed, 27 insertions(+), 36 deletions(-) create mode 100644 cmake-2.8.1.tar.bz2 delete mode 100644 cmake-2.8.2.tar.bz2 diff --git a/cmake-2.8.1.tar.bz2 b/cmake-2.8.1.tar.bz2 new file mode 100644 index 0000000..03abbba --- /dev/null +++ b/cmake-2.8.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04b606adc208b8619aa08449ef05783933e48a57234f6975df20d909bde61384 +size 2746713 diff --git a/cmake-2.8.2.tar.bz2 b/cmake-2.8.2.tar.bz2 deleted file mode 100644 index 6038dea..0000000 --- a/cmake-2.8.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1a54476bf25d8c61a1f5f2eb708e12a3a7487dfe04ad4a5ab91c0d110f39a9a -size 4153648 diff --git a/cmake-disable-builtin-chrpath.diff b/cmake-disable-builtin-chrpath.diff index 93b12ac..9dfb4ed 100644 --- a/cmake-disable-builtin-chrpath.diff +++ b/cmake-disable-builtin-chrpath.diff @@ -1,8 +1,8 @@ Index: Source/cmTarget.cxx =================================================================== ---- Source/cmTarget.cxx.orig 2010-06-28 17:15:59.000000000 +0200 -+++ Source/cmTarget.cxx 2010-07-20 22:27:13.000000000 +0200 -@@ -3785,7 +3785,7 @@ bool cmTarget::IsChrpathUsed(const char* +--- Source/cmTarget.cxx.orig 2009-11-13 19:32:58.000000000 +0100 ++++ Source/cmTarget.cxx 2009-11-26 10:41:29.000000000 +0100 +@@ -3679,7 +3679,7 @@ bool cmTarget::IsChrpathUsed(const char* } // Allow the user to disable builtin chrpath explicitly. diff --git a/cmake-gui.changes b/cmake-gui.changes index 0743391..294fc99 100644 --- a/cmake-gui.changes +++ b/cmake-gui.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -Tue Jul 20 20:37:51 UTC 2010 - puzel@novell.com - -- update to cmake-gui-2.8.2 - - cmake-gui: Add simple grouped view - - cmake-gui: Support build tree under symlink (#9975) - ------------------------------------------------------------------- Tue May 25 14:12:51 UTC 2010 - puzel@novell.com diff --git a/cmake-gui.spec b/cmake-gui.spec index 0211ed7..057d220 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -1,5 +1,5 @@ # -# spec file for package cmake-gui (Version 2.8.2) +# spec file for package cmake-gui (Version 2.8.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: cmake-gui -Version: 2.8.2 +Version: 2.8.1 Release: 3 License: BSD3c Group: Development/Tools/Building diff --git a/cmake.changes b/cmake.changes index 4ebd82d..f7392d1 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,17 +1,3 @@ -------------------------------------------------------------------- -Tue Jul 20 20:33:49 UTC 2010 - puzel@novell.com - -- update to cmake-2.8.2 - - notable changes: - - CPack: Add native BZip2 support - - ExternalProject: Support .zip and .bz2 archives, MD5 verification - - GetPrerequisites: Provide an override hook - - Recognize ARM ABI/EABI with GNU compilers - - Recognize Clang compiler - - Search basic directories on "Generic" platform - - Support compression with 'cmake -E tar' - - a lot of bugfixes - ------------------------------------------------------------------- Thu Jun 10 16:24:47 UTC 2010 - dimstar@opensuse.org diff --git a/cmake.spec b/cmake.spec index 6a11116..b6de31e 100644 --- a/cmake.spec +++ b/cmake.spec @@ -1,5 +1,5 @@ # -# spec file for package cmake (Version 2.8.2) +# spec file for package cmake (Version 2.8.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: cmake -Version: 2.8.2 +Version: 2.8.1 Release: 3 License: BSD3c Group: Development/Tools/Building diff --git a/fortify-buffer-overflows.diff b/fortify-buffer-overflows.diff index 6ff1bf5..e329848 100644 --- a/fortify-buffer-overflows.diff +++ b/fortify-buffer-overflows.diff @@ -1,8 +1,6 @@ -Index: Source/kwsys/SystemInformation.cxx -=================================================================== ---- Source/kwsys/SystemInformation.cxx.orig 2010-06-28 17:16:00.000000000 +0200 -+++ Source/kwsys/SystemInformation.cxx 2010-07-21 14:13:20.000000000 +0200 -@@ -152,7 +152,7 @@ public: +--- Source/kwsys/SystemInformation.cxx ++++ Source/kwsys/SystemInformation.cxx +@@ -152,7 +152,7 @@ public: #define VENDOR_STRING_LENGTH (12 + 1) @@ -11,3 +9,17 @@ Index: Source/kwsys/SystemInformation.cxx #define SERIALNUMBER_STRING_LENGTH (29 + 1) typedef struct tagID +--- Utilities/cmtar/encode.c ++++ Utilities/cmtar/encode.c +@@ -32,7 +32,10 @@ + int i, sum = 0; + + if (t->options & TAR_GNU) +- strncpy(t->th_buf.magic, "ustar ", 8); ++ { ++ strncpy(t->th_buf.version, " ", TVERSLEN); ++ strncpy(t->th_buf.magic, "ustar", TMAGLEN); ++ } + else + { + strncpy(t->th_buf.version, TVERSION, TVERSLEN);