diff options
| author | Xiyue Deng | 2013-02-02 01:00:08 -0800 |
|---|---|---|
| committer | Mike McQuaid | 2013-02-02 15:42:14 -0800 |
| commit | 00ac880dcfe0bff65b50fc02acab7586b0941dc0 (patch) | |
| tree | 9ba8121dab20402efc9dd169bbbbbfc527fcf1fa /Library | |
| parent | e3426cb74f7f21d3b28988855f0f8e453e766c7e (diff) | |
| download | homebrew-00ac880dcfe0bff65b50fc02acab7586b0941dc0.tar.bz2 | |
boost and boost149: security fix.
* Add upstream patch for security fix in Boost.Locale when not
building head. Detail:
http://www.boost.org/users/news/boost_locale_security_notice.html
* Use upstream changesets as patch and don't apply when building head.
Closes #17524.
Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Formula/boost.rb | 21 | ||||
| -rw-r--r-- | Library/Formula/boost149.rb | 5 |
2 files changed, 20 insertions, 6 deletions
diff --git a/Library/Formula/boost.rb b/Library/Formula/boost.rb index aea7d0444..21b33965a 100644 --- a/Library/Formula/boost.rb +++ b/Library/Formula/boost.rb @@ -55,13 +55,22 @@ class Boost < Formula false end - # Patch boost/config/stdlib/libcpp.hpp to fix the constexpr bug reported under Boost 1.52 in Ticket - # 7671. This patch can be removed when upstream release an updated version including the fix. def patches - if MacOS.version >= :lion and build.include? 'with-c++11' - {:p0 => "https://svn.boost.org/trac/boost/raw-attachment/ticket/7671/libcpp_c11_numeric_limits.patch"} - end - end + { + :p2 => [ + # Patch boost/config/stdlib/libcpp.hpp to fix the constexpr + # bug reported under Boost 1.52 in Ticket 7671. This patch + # can be removed when upstream release an updated version + # including the fix. + "https://svn.boost.org/trac/boost/changeset/82391?format=diff&new=82391", + + # Security fix for Boost.Locale. For details: + # http://www.boost.org/users/news/boost_locale_security_notice.html + # Drop when 1.53.0+ releases. + "https://svn.boost.org/trac/boost/changeset/81590?format=diff&new=81590" + ] + } + end unless build.head? def install # Adjust the name the libs are installed under to include the path to the diff --git a/Library/Formula/boost149.rb b/Library/Formula/boost149.rb index 490b4671c..1c81df650 100644 --- a/Library/Formula/boost149.rb +++ b/Library/Formula/boost149.rb @@ -35,6 +35,11 @@ class Boost149 < Formula cause "Dropped arguments to functions when linking with boost" end + def patches + # Security fix for Boost.Locale. For details: http://www.boost.org/users/news/boost_locale_security_notice.html + {:p0 => "http://cppcms.com/files/locale/boost_locale_utf.patch"} + end + def install # Adjust the name the libs are installed under to include the path to the # full keg library location. |