testing/cmake
SHA256
3
0
Fork 0
forked from pool/cmake
Code Pull Requests Activity

Accepting request 32482 from devel:tools:building

Browse Source 
Copy from devel:tools:building/cmake based on submit request 32482 from user dirkmueller

OBS-URL: https://build.opensuse.org/request/show/32482
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cmake?expand=0&rev=32
This commit is contained in:
OBS User autobuild 2010-02-13 15:24:19 +00:00 committed by Git OBS Bridge
parent 62709b794b
commit 1b28bc83f1
3 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Feb 13 16:09:25 CET 2010 - dmueller@suse.de
- fix fortify related static buffer overflows (not exploitable)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 27 14:00:50 CET 2009 - puzel@suse.cz Fri Nov 27 14:00:50 CET 2009 - puzel@suse.cz

6
cmake.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package cmake (Version 2.8.0) # spec file for package cmake (Version 2.8.0)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -20,13 +20,14 @@
Name: cmake Name: cmake
Version: 2.8.0 Version: 2.8.0
Release: 1 Release: 2
License: BSD3c License: BSD3c
Group: Development/Tools/Building Group: Development/Tools/Building
%define tar_version %version %define tar_version %version
Url: http://www.cmake.org/ Url: http://www.cmake.org/
Source0: %{name}-%{tar_version}.tar.bz2 Source0: %{name}-%{tar_version}.tar.bz2
Patch4: cmake-disable-builtin-chrpath.diff Patch4: cmake-disable-builtin-chrpath.diff
Patch5: fortify-buffer-overflows.diff
Summary: Cross-platform, open-source make system Summary: Cross-platform, open-source make system
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} > 1020 %if 0%{?suse_version} > 1020
@ -66,6 +67,7 @@ Authors:
%prep %prep
%setup -q -n %name-%tar_version %setup -q -n %name-%tar_version
%patch4 %patch4
%patch5
%build %build
EXTRA_FLAGS="" EXTRA_FLAGS=""

25
fortify-buffer-overflows.diff Normal file
View File

@ -0,0 +1,25 @@
--- Source/kwsys/SystemInformation.cxx
+++ Source/kwsys/SystemInformation.cxx
@@ -139,7 +139,7 @@
void RunMemoryCheck();
public:
#define VENDOR_STRING_LENGTH (12 + 1)
-#define CHIPNAME_STRING_LENGTH (48 + 1)
+#define CHIPNAME_STRING_LENGTH (70 + 1)
#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);