diff options
| author | wiz <wiz@pkgsrc.org> | 2015-02-05 18:20:06 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2015-02-05 18:20:06 +0000 |
| commit | ddbacbf7405d938b531dc22bce04a216aef4d3c7 (patch) | |
| tree | d1e462e7c866a637e39e98b690da6ae61ca550bc /devel/cmake | |
| parent | 964f6660d88bf77758d5b77560f309ee63f664d2 (diff) | |
| download | pkgsrc-ddbacbf7405d938b531dc22bce04a216aef4d3c7.tar.gz | |
Bug was fixed slightly differently upstream, remove unnecessary patch.
Diffstat (limited to 'devel/cmake')
| -rw-r--r-- | devel/cmake/distinfo | 3 | ||||
| -rw-r--r-- | devel/cmake/patches/patch-Source_kwsys_Directory.cxx | 27 |
2 files changed, 1 insertions, 29 deletions
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo index b11c8702915..c38fb5eedd7 100644 --- a/devel/cmake/distinfo +++ b/devel/cmake/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.66 2015/02/05 17:45:22 adam Exp $ +$NetBSD: distinfo,v 1.67 2015/02/05 18:20:06 wiz Exp $ SHA1 (cmake-3.1.2.tar.gz) = 66c7b73d460daf2e26dc17da1d7e7dfd14bc48fc RMD160 (cmake-3.1.2.tar.gz) = 50caf6ff5de97390decf43446ef0733750a5862c @@ -7,7 +7,6 @@ SHA1 (patch-Modules_FindX11.cmake) = 07a831744fc1de15d2fe4f57399339200e572dc5 SHA1 (patch-Modules_Platform_SCO__SV.cmake) = 3ed230b3a06ea693812db8f57bc73aebec12b99f SHA1 (patch-Modules_Platform_SunOS.cmake) = 7a53ae3c902dd69ee22ef9fe0ae2a022d5284f16 SHA1 (patch-Source_cmELF.cxx) = 5eb9dc0b3567b5685596ddf0a03ca8e5c76e6f92 -SHA1 (patch-Source_kwsys_Directory.cxx) = 0417be593f3698ec9766b8b3d6f41a0deb07b4f8 SHA1 (patch-Source_kwsys_SystemInformation.cxx) = e259da70601cf1b4641f253de3d4f3aaec5e68f6 SHA1 (patch-Source_kwsys_SystemTools.cxx) = 634348b9bc8ccf8c72f23837baa6ba0bcacf5961 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = 4e8cef0eab2ad8cb27cd7076e077bb5e7425a95c diff --git a/devel/cmake/patches/patch-Source_kwsys_Directory.cxx b/devel/cmake/patches/patch-Source_kwsys_Directory.cxx deleted file mode 100644 index 18a63f79275..00000000000 --- a/devel/cmake/patches/patch-Source_kwsys_Directory.cxx +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-Source_kwsys_Directory.cxx,v 1.2 2015/02/05 17:45:22 adam Exp $ - -When opendir() fails, readdir() is called with a NULL pointer, leading to -a segfault. - -http://public.kitware.com/Bug/view.php?id=15367 - ---- Source/kwsys/Directory.cxx.orig 2015-02-04 20:36:44.000000000 +0000 -+++ Source/kwsys/Directory.cxx -@@ -245,11 +245,14 @@ unsigned long Directory::GetNumberOfFile - } - - unsigned long count = 0; -- for (dirent* d = readdir(dir); d; d = readdir(dir) ) -+ if (dir) - { -- count++; -+ for (dirent* d = readdir(dir); d; d = readdir(dir) ) -+ { -+ count++; -+ } -+ closedir(dir); - } -- closedir(dir); - return count; - } - |