diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2010-12-25 17:05:11 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2010-12-25 17:05:11 +0000 |
| commit | 9dab81e32a94a42f6f19808313582b026254e912 (patch) | |
| tree | 2d8b55a6bd887506225fec49b465cec386c1e466 /dev-util/cmake/files | |
| parent | Fix dependencies. Set SUPPORT_PYTHON_ABIS. Avoid breaking strict-aliasing rules. (diff) | |
| download | gentoo-2-9dab81e32a94a42f6f19808313582b026254e912.tar.gz gentoo-2-9dab81e32a94a42f6f19808313582b026254e912.tar.bz2 gentoo-2-9dab81e32a94a42f6f19808313582b026254e912.zip | |
Fix ruby finding per bug #345993 and buffer overflowing per bug #329043.
(Portage version: 2.2.0_alpha10/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/cmake/files')
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.3-buffer_overflow.patch | 12 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch | 12 |
2 files changed, 24 insertions, 0 deletions
diff --git a/dev-util/cmake/files/cmake-2.8.3-buffer_overflow.patch b/dev-util/cmake/files/cmake-2.8.3-buffer_overflow.patch new file mode 100644 index 000000000000..6bc5a6641a09 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.3-buffer_overflow.patch @@ -0,0 +1,12 @@ +diff -urN cmake-2.8.3.orig//Source/kwsys/SystemInformation.cxx cmake-2.8.3//Source/kwsys/SystemInformation.cxx +--- cmake-2.8.3.orig//Source/kwsys/SystemInformation.cxx 2010-12-25 16:56:42.609163498 +0100 ++++ cmake-2.8.3//Source/kwsys/SystemInformation.cxx 2010-12-25 17:25:18.002163499 +0100 +@@ -152,7 +152,7 @@ + + public: + #define VENDOR_STRING_LENGTH (12 + 1) +-#define CHIPNAME_STRING_LENGTH (48 + 1) ++#define CHIPNAME_STRING_LENGTH (68 + 1) + #define SERIALNUMBER_STRING_LENGTH (29 + 1) + + typedef struct tagID diff --git a/dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch b/dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch new file mode 100644 index 000000000000..45d2b162c5b7 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch @@ -0,0 +1,12 @@ +diff -urN cmake-2.8.3.orig//Modules/FindRuby.cmake cmake-2.8.3//Modules/FindRuby.cmake +--- cmake-2.8.3.orig//Modules/FindRuby.cmake 2010-12-25 16:56:42.597163498 +0100 ++++ cmake-2.8.3//Modules/FindRuby.cmake 2010-12-25 16:57:55.207163499 +0100 +@@ -180,7 +180,7 @@ + + + # Determine the list of possible names for the ruby library +-SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT}) ++SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} ruby${_RUBY_VERSION_SHORT_NODOT}) + + IF(WIN32) + SET( _RUBY_MSVC_RUNTIME "" ) |