[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 2a325066d4b3dc232e42dfce043e4954df4f2a0c
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via 2a325066d4b3dc232e42dfce043e4954df4f2a0c (commit) via a9b2df01241334e65d308223da4f63c8a18d1f70 (commit) via f0c126f284ce75426debd853c04fbf24378b0ef3 (commit) via 0e4f8ad068d1d919fdfa737e24f0e681f4d65380 (commit) via 8dd4ce221b39b8c7baeda97bddda2c7416588dec (commit) via f7bfe44b25aae50ca6328ef534cea2c72ea10701 (commit) via 0fced0eb776d490cd6eed0997b8acdd8a711f026 (commit) via 8c6b7669b220df0fae6f2644b9c9f04452ea9b78 (commit) via 296b6d1dc94721e88315abdde3b71d54a3ad001a (commit) via cbe7d7b562ef8abd10a86d3a2254ba1cce7b03a7 (commit) from 899e58342f3fc8b3b532f593768d90be04f7c48a (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 2a325066d4b3dc232e42dfce043e4954df4f2a0c Author: Alexander Marx alexander.marx@ipfire.org Date: Mon Apr 18 09:05:34 2016 +0200
lzip: Update to 1.17
this is an Update release
Signed-off-by: Alexander Marx alexander.marx@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a9b2df01241334e65d308223da4f63c8a18d1f70 Author: Alexander Marx alexander.marx@ipfire.org Date: Mon Apr 18 09:07:48 2016 +0200
lzo: Update to 2.09
Changes in 2.09 (04 Feb 2015) * Work around gcc bug #64516 that could affect architectures like armv4, armv5 and sparc.
Changes in 2.08 (29 Jun 2014) * Updated the Autoconf scripts to fix some reported build problems. * Added CMake build support. * Fixed lzo_init() on big-endian architectures like Sparc.
Changes in 2.07 (25 Jun 2014) * Fixed a potential integer overflow condition in the "safe" decompressor variants which could result in a possible buffer overrun when processing maliciously crafted compressed input data.
Fortunately this issue only affects 32-bit systems and also can only happen if you use uncommonly huge buffer sizes where you have to decompress more than 16 MiB (> 2^24 bytes) untrusted compressed bytes within a single function call, so the practical implications are limited.
POTENTIAL SECURITY ISSUE. CVE-2014-4607.
* Removed support for ancient configurations like 16-bit "huge" pointers - LZO now requires a flat 32-bit or 64-bit memory model. * Assorted cleanups.
Signed-off-by: Alexander Marx alexander.marx@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f0c126f284ce75426debd853c04fbf24378b0ef3 Author: Alexander Marx alexander.marx@ipfire.org Date: Mon Apr 18 09:09:48 2016 +0200
mailcap: Update to 2.1.45
- mime.types: Sync with IANA as of 2015-09-25. - Generate and install mime.types for use with nginx.
Signed-off-by: Alexander Marx alexander.marx@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 0e4f8ad068d1d919fdfa737e24f0e681f4d65380 Author: Alexander Marx alexander.marx@ipfire.org Date: Mon Apr 18 09:13:03 2016 +0200
mc: Update to: 4.8.16
Version 4.8.16
- Core * Support for ash + bugfixes for bash, fish (#2742) * Find file: empty file name matches any file name (#3593) * Find file: empty value of "Content" is used instead of "Search for content" checkbox to disable search for content (#3594) * Listbox: don't wraparound on mouse scroll (#3554) * Internals: * Listbox: various fixups (#3569: #3562, #3563, #3565, #3161) * Split MSG_ACTION into MSG_ACTION and MSG_NOTIFY (#3566)
- VFS * Support lzip compression format (#2673, #1541) * Support lz4 compression format (#3523) * patchfs: support xz compression (#3443) * Update uc1541 version (#3527) * Add mc.ext patterns for initramfs / initrd (#3115)
- Editor * Add golang syntax (MidnightCommander/mc#84) * Update Puppet syntax (MidnightCommander/mc#86)
- Misc * Code cleanup (#3555, #3547, #3587) * Better subshell documentation (#3556) * Fixes to the English man pages by Denys Vlasenko
- Fixes * Insufficient quoting in `mc.menu` (#2947) * Broken ./configure --without-internal-edit (#3601) * Memory leaks (#3547, #3561, #3567, #3572) * No preallocation if appending during file copy (#3577) * Cannot set mini-format for "brief" listing type (#3588) * Info panel: incorrect inode information in some cases (#3214) * Info panel: wrong device name with symbolic link (#3412) * Info panel: buffer overflow (#3582) * Regression: match filename, not full path in mc.ext (#3578) * Broken case insensitive search in non-unicode locale (#3491) * Error message prefixed with no sense "0:" (#3269) * mcedit: buffer overflow (#3579) * mcedit: "Lower case selection" command in User Menu (#3586) * mcedit: close on ctrl-g (#3557) * mcview: "Not found" result isn't reported in some cases (#3543) * VFS: isofs doesn't show .dotfiles (#3537) * VFS: isofs: cannot copy file from iso when Joliet without RockRidge is used (#2851) * VFS: extfs/unzip: enter into zip file fails with "inconsistent extfs archive" (#3433) * VFS: SFTP: various bugs (#3581) * VFS: FISH: provide major/minor info for block/char devices (#3599) * Bashism in gitfs+ extfs helper (#3379) * Non-portable invocation of man (#3509) * mc-wrapper leaves MC_USER set (#3550) * Broken silent opening of files in background (#3574) * Run `identify` on JPEGs even if `exif` is not installed (#3568)
Version 4.8.15
- Core * Minimal version of GLib is 2.26.0 * Use the PATH environment variable to search for the executable when opening pipe (#3444) * Support more than 2 (up to 9) columns in file panel in brief mode (#3212) * Clarify file sorting in "Unsorted" mode (#3496) * WGroupbox: respect dialog's colors (#3468) * Highlight find file's result in internal viewer (#3530)
- VFS * s3 extfs vfs: bugfixes and improvements (#3470, #3502)
- Editor * Add hidden option to choose full or base file name in the status line (#3445) * Improvements of syntax highlighting: - Lua (#3471) - PKGBUILD (#3484)
- Misc * Text alignment in Info panel (#3155) * Select of menu file edit: change default button to "User" (#3493) * Recognize .gmo files as well as .mo ones (#3422) * Fix mc.pot comment tripping up Transifex and unportable inplace sed (#3479) * A lot of code clean up (#3420, #3424, #3426, #3427, #3428, #3429, #3430, #3431, #3434, #3435, #3437, #3463, #3464, #3465, #3466, #3467, #3494, #3495, #3539) * Documentation updates: - Spanish man and help: Diff Viewer section and minor fixes (#3477) - VFS garbage collection (#3472)
- Fixes * Various memory leaks (#3438, #3439, #3440, #3457, #3458, #3459, #3460, #3461, #3462, #3475, #3520, #3521, #3522) * Linux kernel-specific segfault on startup (#3441) * Lost of Panelize contents in some cases (#3032, #3489, #3498, #3507) * Wrong highlight of search result in case of "Regular expression" and "Whole words" (#3524) * "Whole words" search works only in Normal mode (#3525) * View find results doesn't jump to match line if file is too short to scroll page (#3530) * SFTP VFS: segfault (#3456) * Segfault in "Find file" due to invalid UTF-8 sequences (#3449) * Bash variable 'PROMPT_COMMAND' in pantheon-terminal (#3534)
Version 4.8.14
- Core
* Minimal version of GLib is 2.14.0 * Add new panel binding "!SelectExt" to select/unselect files with the same extension as the current file (#3228) * Speed up of directory size calculation (#3247) * Support of italic text (#3065)
- Editor
* New syntax highlighting support: - puppet (#3266)
- Viewer
* Rewrite mcview's rendering and scrolling (#3250, #3256) - no more partial lines at the top and failure to scroll when Up or Down is pressed; - better handling of CJK characters; - handle combining accents; - improved nroff support; - more conventional scrolling behavior at the end of the file. * Use VIEW_SELECTED_COLOR in plain mode (#3405) * In !QuickView panel, don't pass any chars to command line to avoid unexpected command execution (#3253)
- Misc
* Code cleanup (#3265, #3262) * Bind poedit to Edit action for .po files (#3287) * Better grammar mcedit user menu (#3246)
- Fixes
* Fail to build against musl libc (#3267) * Error compiling with glib 2.20.3 (#3333) * Overwrite of the PROMPT_COMMAND bash variable (#2027) * contrib/*.?sh are not recreated after rerun of configure (#3181) * File rename handles zero-length substitutions incorrectly (#2952) * Lose files on "Skip" when "Cannot preallocate space for target file" (#3297) * Info panel can't obtain file system statistics on Solaris (#3277) * "Shell patterns" broken beyond repair (#2309) * File selection by patterns uses bytes instead of unicode characters (#2743) * Copy files dosn't work as expected, when copying to a directory with the special symbol in its name (#3235) * Wrong order of old_colors table items (#3404) * Input line: Alt+Backspace on one-letter word erases too much (#3390) * "Directory scanning" window is too narrow (#3162) * No Help for User Menu (#3409) * mcedit: paste from clipboard does not work (#3339) * mcviewer: hang when viewing broken man page (#2966) * mcview hex: incorrect highlight when search string not found (#3263) * mcview hex edit: UTF-8 chars are not updated (#3259) * mcview hex edit: can't enter certain UTF-8 characters (#3260) * mcview hex edit: CJK overflow (#3261) * mcedit: status line doesn't show full path to file (#3285) * Freeze when copying from one FTP location to another (#358)
Version 4.8.13
- Core
* New engine of user-friendly interruption of long-time operations (#2136)
- Editor
* Improvements of syntax highlighting: * CMake (#3216) * PHP (#3230) * Translate language names in the spelling assistant dialogue (#3233)
- Viewer
* Add separate normal(default) colour pair for viewer (#3204) * Dealing with utf-8 man pages in view/open (#1539) * "Goto line" is 1-based now (#3245)
- Misc
* Code cleanup (#3189, #3223, #3242) * Add new skins: gray-green-purple256 and gray-orange-blue256 (#3190)
- Fixes
* First Backspace/Delete is ignored after mouse click in an input widget (#3225) * Recursive find file doesn't work on Samba share (#3097) * Recursive find file doesn't work on Windows NFS share (#3202) * Incorrect file counter in move operation (#3196, #3209) * "Directory scanning" window is too narrow (#3162) * Colon is not recognized inside escape seq in prompt (#3241) * Quick view doesn't grab focus on mouse click (#3251) * fish subshell: overridden prompt (#3232, #3237) * mcviewer: broken switch between raw and parse modes (#3219) * mcviewer: incorrect percentage in mcview hex mode (#3258) * RAR VFS incorrectly recognizes UnRAR version (#3240) * viewbold and viewselected are missing from some skins (#3244) * Incorrect enconding name for manual page (#3239) * "User menu -> View manual page" doesn't do coloring (#3243)
Signed-off-by: Alexander Marx alexander.marx@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8dd4ce221b39b8c7baeda97bddda2c7416588dec Author: Alexander Marx alexander.marx@ipfire.org Date: Mon Apr 18 09:19:24 2016 +0200
mdadm: Update to 3.4
This is an Update release
Signed-off-by: Alexander Marx alexander.marx@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f7bfe44b25aae50ca6328ef534cea2c72ea10701 Author: Alexander Marx alexander.marx@ipfire.org Date: Mon Apr 18 09:24:16 2016 +0200
minicom: Update to 2.7
This is an Update release
Signed-off-by: Alexander Marx alexander.marx@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 0fced0eb776d490cd6eed0997b8acdd8a711f026 Author: Alexander Marx alexander.marx@ipfire.org Date: Mon Apr 18 09:26:53 2016 +0200
mtr: Update to 0.85
This is an Update release
Signed-off-by: Alexander Marx alexander.marx@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8c6b7669b220df0fae6f2644b9c9f04452ea9b78 Author: Alexander Marx alexander.marx@ipfire.org Date: Mon Apr 18 09:31:23 2016 +0200
nasm: Update to 2.12.01
This is an Update release
Signed-off-by: Alexander Marx alexander.marx@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 296b6d1dc94721e88315abdde3b71d54a3ad001a Author: Alexander Marx alexander.marx@ipfire.org Date: Tue Apr 19 14:16:47 2016 +0200
tzdata: Update to 2016d
This is an Update-release
Signed-off-by: Alexander Marx alexander.marx@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit cbe7d7b562ef8abd10a86d3a2254ba1cce7b03a7 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Apr 15 08:52:12 2016 +0200
] boost: Update to 1.60.0.
This is a major update to the latest available version of boost.
Fixes #11018.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: boost/boost.nm | 21 +-- boost/patches/boost-1.48.0-add-bjam-man-page.patch | 150 +++++++++++++++++++++ .../patches/boost-1.50.0-fix-non-utf8-files.patch | 22 +++ .../boost-1.51.0-context-no-exec-stack.patch | 28 ---- ...1.55.0-python-test-PyImport_AppendInittab.patch | 98 ++++++++++++++ boost/patches/boost-1.57.0-build-optflags.patch | 48 +++++++ boost/patches/boost-1.57.0-mpl-print.patch | 31 +++++ .../patches/boost-1.57.0-python-abi_letters.patch | 62 +++++++++ .../boost-1.57.0-python-libpython_dep.patch | 13 ++ .../boost-1.57.0-spirit-unused_typedef.patch | 19 +++ boost/patches/boost-1.58.0-pool-test_linking.patch | 31 +++++ boost/patches/boost-1.58.0-pool.patch0 | 120 +++++++++++++++++ boost/patches/boost-1.59-test-fenv.patch2 | 32 +++++ lzip/lzip.nm | 2 +- lzo/lzo.nm | 2 +- mailcap/mailcap.nm | 6 +- mc/mc.nm | 2 +- mdadm/mdadm.nm | 2 +- minicom/minicom.nm | 4 +- mtr/mtr.nm | 3 +- nasm/nasm.nm | 4 +- tzdata/tzdata.nm | 4 +- 22 files changed, 653 insertions(+), 51 deletions(-) create mode 100644 boost/patches/boost-1.48.0-add-bjam-man-page.patch create mode 100644 boost/patches/boost-1.50.0-fix-non-utf8-files.patch delete mode 100644 boost/patches/boost-1.51.0-context-no-exec-stack.patch create mode 100644 boost/patches/boost-1.55.0-python-test-PyImport_AppendInittab.patch create mode 100644 boost/patches/boost-1.57.0-build-optflags.patch create mode 100644 boost/patches/boost-1.57.0-mpl-print.patch create mode 100644 boost/patches/boost-1.57.0-python-abi_letters.patch create mode 100644 boost/patches/boost-1.57.0-python-libpython_dep.patch create mode 100644 boost/patches/boost-1.57.0-spirit-unused_typedef.patch create mode 100644 boost/patches/boost-1.58.0-pool-test_linking.patch create mode 100644 boost/patches/boost-1.58.0-pool.patch0 create mode 100644 boost/patches/boost-1.59-test-fenv.patch2
Difference in files: diff --git a/boost/boost.nm b/boost/boost.nm index 889b316..0a6af33 100644 --- a/boost/boost.nm +++ b/boost/boost.nm @@ -5,10 +5,10 @@
name = boost ver_major = 1 -ver_minor = 51 +ver_minor = 60 ver_plevel = 0 version = %{ver_major}.%{ver_minor}.%{ver_plevel} -release = 2 +release = 1
groups = System/Libraries url = http://www.boost.org/ @@ -31,6 +31,7 @@ build requires bzip2-devel gcc-c++ + icu-devel python-devel python3-devel zlib-devel @@ -39,12 +40,13 @@ build CFLAGS += -fno-strict-aliasing CXXFLAGS += -fno-strict-aliasing
- # Don't build in parallel on ARM. + # Obtain python3 abiflags. + python3_abiflags = %(python3-config --abiflags) + + # Don't build in parallel on any architecture. # The C++ compiles consumes too much memory, so # we cannot run multiple instances at once. - if "%{DISTRO_PLATFORM}" == "arm" - PARALLELISMFLAGS = -j2 - end + PARALLELISMFLAGS = -j2
configure_options = \ --layout=tagged \ @@ -68,11 +70,12 @@ build mkdir -pv %{DIR_APP}/serial
# Bootstrap build environment. - ./bootstrap.sh --with-toolset=gcc + ./bootstrap.sh --with-toolset=gcc --with-icu
# Enable boost lib for python3. - cat >> ./tools/build/v2/user-config.jam << EOF - using python : %{python3_version} : %{python3} : %{includedir}/python%{python3_version}%{python3_abiflags} : %{libdir}/python%{python3_version} ; + cat >> ./tools/build/src/user-config.jam << EOF + using python : %{python_version} : %{python2} : %{includedir}/python%{python_version} : : : : ; + using python : %{python3_version} : %{python3} : %{includedir}/python%{python3_version}%{python3_abiflags} : : : : %{python3_abiflags} ; EOF end
diff --git a/boost/patches/boost-1.48.0-add-bjam-man-page.patch b/boost/patches/boost-1.48.0-add-bjam-man-page.patch new file mode 100644 index 0000000..ea3f19f --- /dev/null +++ b/boost/patches/boost-1.48.0-add-bjam-man-page.patch @@ -0,0 +1,150 @@ +diff --git a/tools/build/v2/doc/bjam.1 b/tools/build/v2/doc/bjam.1 +new file mode 100644 +index 0000000..8a44af6 +--- /dev/null ++++ b/tools/build/v2/doc/bjam.1 +@@ -0,0 +1,144 @@ ++.TH "bjam" 1 "Sat Nov 19 2011" "Doxygen" " -*- nroff -*- ++.ad l ++.nh ++.SH NAME ++bjam - Command-line utility to build Boost-related C++ projects with Boost&.Build ++.SH "SYNOPSIS" ++.PP ++\fBbjam\fP \fC[-a] [-dx] [-fx] [-jx] [-lx] [-n] [-ox] [-px] [-q] [-sx=y] [-tx] [-v] [--x]\fP ++.PP ++\fIbjam\fP accepts the following options: ++.PP ++\fB-a\fP ++.br ++ Build all targets, even if they are current ++.PP ++\fB-dx\fP ++.br ++ Set the debug level to x (0-9) ++.PP ++\fB-fx\fP ++.br ++ Read x instead of Jambase ++.PP ++\fB-jx\fP ++.br ++ Run up to x shell commands concurrently ++.PP ++\fB-lx\fP ++.br ++ Limit actions to x number of seconds after which they are stopped ++.PP ++\fB-n\fP ++.br ++ Don't actually execute the updating actions ++.PP ++\fB-ox\fP ++.br ++ Write the updating actions to file x ++.PP ++\fB-px\fP ++.br ++ x=0, pipes action stdout and stderr merged into action output ++.PP ++\fB-q\fP ++.br ++ Quit quickly as soon as a target fails ++.PP ++\fB-sx=y\fP ++.br ++ Set variable x=y, overriding environment ++.PP ++\fB-tx\fP ++.br ++ Rebuild x, even if it is up-to-date ++.PP ++\fB-v\fP ++.br ++ Print the version of jam and exit ++.PP ++\fB--x\fP ++.br ++ Option is ignored ++.SH "DESCRIPTION" ++.PP ++This section provides the information necessary to create your own projects using \fIBoost&.Build\fP The information provided here is relatively high-level, and Chapter 6, Reference as well as the on-line help system must be used to obtain low-level documentation (see --help) ++.PP ++\fIBoost&.Build\fP actually consists of two parts - \fIBoost&.Jam\fP, a build engine with its own interpreted language, and \fIBoost&.Build\fP itself, implemented in \fIBoost&.Jam's\fP language&. The chain of events when you type bjam on the command line is as follows: ++.IP "(bu" 2 ++\fIBoost&.Jam\fP tries to find \fIBoost&.Build\fP and loads the top-level module&. The exact process is described in the section called âInitializationâ ++.PP ++.PP ++.IP "(bu" 2 ++The top-level module loads user-defined configuration files, \fIuser-config&.jam\fP and \fIsite-config&.jam\fP, which define available toolsets ++.PP ++.PP ++.IP "(bu" 2 ++The \fIJamfile\fP in the current directory is read That in turn might cause reading of further Jamfiles&. As a result, a tree of projects is created, with targets inside projects ++.PP ++.PP ++.IP "(bu" 2 ++Finally, using the build request specified on the command line, \fIBoost&.Build\fP decides which targets should be built and how&. That information is passed back to \fIBoost&.Jam\fP, which takes care of actually running the scheduled build action commands ++.PP ++.PP ++So, to be able to successfully use \fIBoost&.Build\fP, you need to know only four things: ++.IP "(bu" 2 ++How to configure \fIBoost&.Build\fP (http://www.boost.org/boost-build2/doc/html/bbv2/overview/configuration.html) ++.IP "(bu" 2 ++How to declare targets in Jamfiles (http://www.boost.org/boost-build2/doc/html/bbv2/overview/targets.html) ++.IP "(bu" 2 ++How the build process works (http://www.boost.org/boost-build2/doc/html/bbv2/overview/build_process.html) ++.PP ++.PP ++Some Basics about the \fIBoost&.Jam\fP language&. See the section called âBoost&.Jam Languageâ (http://www.boost.org/boost-build2/doc/html/bbv2/overview/jam_language.html) ++.SH "CONCEPTS" ++.PP ++\fIBoost&.Build\fP has a few unique concepts that are introduced in this section&. The best way to explain the concepts is by comparison with more classical build tools ++.PP ++When using any flavour of make, you directly specify targets and commands that are used to create them from other target&. The below example creates a&.o from a&.c using a hardcoded compiler invocation command ++.PP ++a&.o: a&.c ++.br ++ g++ -o a&.o -g a&.c ++.PP ++This is rather low-level description mechanism and it is hard to adjust commands, options, and sets of created targets depending on the used compiler and operating system&. ++.PP ++To improve portability, most modern build system provide a set of higher-level functions that can be used in build description files&. Consider this example: ++.PP ++add_program ('a', 'a&.c') ++.br ++.PP ++This is a function call that creates targets necessary to create executable file from source file a&.c&. Depending on configured properties, different commands line may be used&. However, \fIadd_program\fP is higher-level, but rather thin level All targets are created immediately when build description is parsed, which makes it impossible to perform multi-variant builds&. Often, change in any build property requires complete reconfiguration of the build tree ++.PP ++In order to support true multivariant builds, Boost&.Build introduces the concept of metatargetâobject that is created when build description is parsed and can be later called with specific build properties to generate actual targets ++.PP ++Consider an example: ++.PP ++exe a : a&.cpp ; ++.br ++.PP ++When this declaration is parsed, \fIBoost&.Build\fP creates a metatarget, but does not yet decides what files must be created, or what commands must be used&. After all build files are parsed, Boost&.Build considers properties requested on the command line&. Supposed you have invoked \fIBoost&.Build\fP with: ++.PP ++\fIbjam\fP toolset=gcc toolset=msvc ++.br ++.PP ++In that case, the metatarget will be called twice, once with toolset=gcc and once with toolset=msvc&. Both invocations will produce concrete targets, that will have different extensions and use different command lines&. Another key concept is build property&. Build property is a variable that affects the build process&. It can be specified on the command line, and is passed when calling a metatarget ++.PP ++While all build tools have a similar mechanism, \fIBoost&.Build\fP differs by requiring that all build properties are declared in advance, and providing a large set of properties with portable semantics ++.PP ++The final concept is property propagation&. Boost&.Build does not require that every metatarget is called with the same properties&. Instead, the 'top-level' metatargets are called with the properties specified on the command line Each metatarget can elect to augment or override some properties (in particular, using the requirements mechanism, see the section called âRequirementsâ: http://www.boost.org/boost-build2/doc/html/bbv2/overview/targets.html#bbv2.o...) Then, the dependency metatargets are called with modified properties and produce concrete targets that are then used in build process Of course, dependency metatargets maybe in turn modify build properties and have dependencies of their own&. ++.PP ++For more in-depth treatment of the requirements and concepts, you may refer to SYRCoSE 2009 Boost&.Build article (http://syrcose.ispras.ru/2009/files/04_paper.pdf)%5C&. ++.SH "SEE ALSO" ++.PP ++\fBboost-libraries\fP(3) ++.SH "SUPPORT" ++.PP ++Please report any bugs to https://svn.boost.org/trac/boost/ ++.SH "COPYRIGHT" ++.PP ++Boost Software License - Version 1&.0 - August 17th, 2003 ++.PP ++See the LICENSE_1_0&.txt file for more information on that license, or directly on Internet: ++.br ++ http://www.boost.org/LICENSE_1_0.txt diff --git a/boost/patches/boost-1.50.0-fix-non-utf8-files.patch b/boost/patches/boost-1.50.0-fix-non-utf8-files.patch new file mode 100644 index 0000000..b60a3ac --- /dev/null +++ b/boost/patches/boost-1.50.0-fix-non-utf8-files.patch @@ -0,0 +1,22 @@ +diff --git a/libs/units/example/autoprefixes.cpp b/libs/units/example/autoprefixes.cpp +index 8b2bc43..d04f2fe 100644 +--- a/libs/units/example/autoprefixes.cpp ++++ b/libs/units/example/autoprefixes.cpp +@@ -67,7 +67,7 @@ struct thing_base_unit : boost::units::base_unit<thing_base_unit, boost::units:: + struct euro_base_unit : boost::units::base_unit<euro_base_unit, boost::units::dimensionless_type, 5> + { + static const char* name() { return("EUR"); } +- static const char* symbol() { return(""); } ++ static const char* symbol() { return("â¬"); } + }; + + int main() +@@ -140,7 +140,7 @@ int main() + + quantity<euro_base_unit::unit_type> ce = 2048. * euro_base_unit::unit_type(); + cout << name_format << engineering_prefix << ce << endl; // 2.048 kiloEUR +- cout << symbol_format << engineering_prefix << ce << endl; // 2.048 k ++ cout << symbol_format << engineering_prefix << ce << endl; // 2.048 k⬠+ + + return 0; diff --git a/boost/patches/boost-1.51.0-context-no-exec-stack.patch b/boost/patches/boost-1.51.0-context-no-exec-stack.patch deleted file mode 100644 index dee44ad..0000000 --- a/boost/patches/boost-1.51.0-context-no-exec-stack.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Nur a/libs/context/src/asm/fcontext_arm_aapcs_elf_gas.S b/libs/context/src/asm/fcontext_arm_aapcs_elf_gas.S ---- a/libs/context/src/asm/fcontext_arm_aapcs_elf_gas.S 2012-07-03 21:12:31.000000000 +0200 -+++ b/libs/context/src/asm/fcontext_arm_aapcs_elf_gas.S 2012-10-27 19:25:08.016850683 +0200 -@@ -45,6 +45,10 @@ - * * - * *****************************************************************/ - -+#if defined(__linux__) && defined(__ELF__) -+.section .note.GNU-stack,"",%progbits -+#endif -+ - .text - .globl jump_fcontext - .align 2 -diff -Nur a/libs/context/src/asm/fcontext_i386_sysv_elf_gas.S b/libs/context/src/asm/fcontext_i386_sysv_elf_gas.S ---- a/libs/context/src/asm/fcontext_i386_sysv_elf_gas.S 2012-07-03 21:12:31.000000000 +0200 -+++ b/libs/context/src/asm/fcontext_i386_sysv_elf_gas.S 2012-10-27 19:24:34.166680913 +0200 -@@ -31,6 +31,10 @@ - * * - * *****************************************************************/ - -+#if defined(__linux__) && defined(__ELF__) -+.section .note.GNU-stack,"",%progbits -+#endif -+ - .text - .globl jump_fcontext - .align 2 diff --git a/boost/patches/boost-1.55.0-python-test-PyImport_AppendInittab.patch b/boost/patches/boost-1.55.0-python-test-PyImport_AppendInittab.patch new file mode 100644 index 0000000..1d2ee5c --- /dev/null +++ b/boost/patches/boost-1.55.0-python-test-PyImport_AppendInittab.patch @@ -0,0 +1,98 @@ +diff -up boost_1_55_0/libs/python/test/exec.cpp~ boost_1_55_0/libs/python/test/exec.cpp +--- boost_1_55_0/libs/python/test/exec.cpp~ 2010-07-05 00:38:38.000000000 +0200 ++++ boost_1_55_0/libs/python/test/exec.cpp 2015-01-09 21:31:12.903218280 +0100 +@@ -56,6 +56,20 @@ void eval_test() + BOOST_TEST(value == "ABCDEFG"); + } + ++struct PyCtx ++{ ++ PyCtx() { ++ Py_Initialize(); ++ } ++ ++ ~PyCtx() { ++ // N.B. certain problems may arise when Py_Finalize is called when ++ // using Boost.Python. However in this test suite it all seems to ++ // work fine. ++ Py_Finalize(); ++ } ++}; ++ + void exec_test() + { + // Register the module with the interpreter +@@ -68,6 +82,8 @@ void exec_test() + ) == -1) + throw std::runtime_error("Failed to add embedded_hello to the interpreter's " + "builtin modules"); ++ ++ PyCtx ctx; + // Retrieve the main module + python::object main = python::import("__main__"); + +@@ -148,41 +164,43 @@ void check_pyerr(bool pyerr_expected=fal + } + } + ++template <class Cb> ++bool ++run_and_handle_exception(Cb cb, bool pyerr_expected = false) ++{ ++ PyCtx ctx; ++ if (python::handle_exception(cb)) { ++ check_pyerr(pyerr_expected); ++ return true; ++ } else { ++ return false; ++ } ++} ++ + int main(int argc, char **argv) + { + BOOST_TEST(argc == 2 || argc == 3); + std::string script = argv[1]; +- // Initialize the interpreter +- Py_Initialize(); + +- if (python::handle_exception(eval_test)) { +- check_pyerr(); +- } +- else if(python::handle_exception(exec_test)) { +- check_pyerr(); +- } +- else if (python::handle_exception(boost::bind(exec_file_test, script))) { ++ // N.B. exec_test mustn't be called through run_and_handle_exception ++ // as it needs to handles the python context by itself. ++ if (run_and_handle_exception(eval_test) ++ || python::handle_exception(exec_test)) + check_pyerr(); +- } +- +- if (python::handle_exception(exec_test_error)) +- { +- check_pyerr(/*pyerr_expected*/ true); +- } + else +- { ++ run_and_handle_exception(boost::bind(exec_file_test, script)); ++ ++ if (!run_and_handle_exception(exec_test_error, true)) + BOOST_ERROR("Python exception expected, but not seen."); +- } + + if (argc > 2) { ++ PyCtx ctx; + // The main purpose is to test compilation. Since this test generates + // a file and I (rwgk) am uncertain about the side-effects, run it only + // if explicitly requested. + exercise_embedding_html(); + } + +- // Boost.Python doesn't support Py_Finalize yet. +- // Py_Finalize(); + return boost::report_errors(); + } + + +Diff finished. Fri Jan 9 21:31:13 2015 diff --git a/boost/patches/boost-1.57.0-build-optflags.patch b/boost/patches/boost-1.57.0-build-optflags.patch new file mode 100644 index 0000000..d0b925f --- /dev/null +++ b/boost/patches/boost-1.57.0-build-optflags.patch @@ -0,0 +1,48 @@ +diff -up ./tools/build/src/tools/gcc.jam~ ./tools/build/src/tools/gcc.jam +--- ./tools/build/src/tools/gcc.jam~ 2015-02-09 15:01:04.850331626 +0100 ++++ ./tools/build/src/tools/gcc.jam 2015-02-09 15:44:29.122307134 +0100 +@@ -366,17 +366,17 @@ generators.override gcc.compile.c++.pch + toolset.flags gcc.compile PCH_FILE <pch>on : <pch-file> ; + + # Declare flags and action for compilation. +-toolset.flags gcc.compile OPTIONS <optimization>off : -O0 ; +-toolset.flags gcc.compile OPTIONS <optimization>speed : -O3 ; +-toolset.flags gcc.compile OPTIONS <optimization>space : -Os ; ++toolset.flags gcc.compile OPTIONS <optimization>off : ; ++toolset.flags gcc.compile OPTIONS <optimization>speed : ; ++toolset.flags gcc.compile OPTIONS <optimization>space : ; + +-toolset.flags gcc.compile OPTIONS <inlining>off : -fno-inline ; +-toolset.flags gcc.compile OPTIONS <inlining>on : -Wno-inline ; +-toolset.flags gcc.compile OPTIONS <inlining>full : -finline-functions -Wno-inline ; ++toolset.flags gcc.compile OPTIONS <inlining>off : ; ++toolset.flags gcc.compile OPTIONS <inlining>on : ; ++toolset.flags gcc.compile OPTIONS <inlining>full : ; + +-toolset.flags gcc.compile OPTIONS <warnings>off : -w ; +-toolset.flags gcc.compile OPTIONS <warnings>on : -Wall ; +-toolset.flags gcc.compile OPTIONS <warnings>all : -Wall -pedantic ; ++toolset.flags gcc.compile OPTIONS <warnings>off : ; ++toolset.flags gcc.compile OPTIONS <warnings>on : ; ++toolset.flags gcc.compile OPTIONS <warnings>all : ; + toolset.flags gcc.compile OPTIONS <warnings-as-errors>on : -Werror ; + + toolset.flags gcc.compile OPTIONS <debug-symbols>on : -g ; +@@ -603,7 +603,7 @@ rule compile.fortran ( targets * : sourc + + actions compile.c++ bind PCH_FILE + { +- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" -c -o "$(<:W)" "$(>:W)" ++ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" -c -o "$(<:W)" "$(>:W)" + } + + actions compile.c bind PCH_FILE +@@ -613,7 +613,7 @@ actions compile.c bind PCH_FILE + + actions compile.c++.preprocess bind PCH_FILE + { +- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" "$(>:W)" -E >"$(<:W)" ++ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" "$(>:W)" -E >"$(<:W)" + } + + actions compile.c.preprocess bind PCH_FILE diff --git a/boost/patches/boost-1.57.0-mpl-print.patch b/boost/patches/boost-1.57.0-mpl-print.patch new file mode 100644 index 0000000..561cef1 --- /dev/null +++ b/boost/patches/boost-1.57.0-mpl-print.patch @@ -0,0 +1,31 @@ +diff -up boost_1_57_0/boost/mpl/print.hpp~ boost_1_57_0/boost/mpl/print.hpp +--- boost_1_57_0/boost/mpl/print.hpp~ 2014-07-09 23:12:31.000000000 +0200 ++++ boost_1_57_0/boost/mpl/print.hpp 2015-01-20 12:44:59.621400948 +0100 +@@ -52,16 +52,15 @@ struct print + enum { n = sizeof(T) + -1 }; + #elif defined(__MWERKS__) + void f(int); +-#else +- enum { +- n = +-# if defined(__EDG_VERSION__) +- aux::dependent_unsigned<T>::value > -1 +-# else +- sizeof(T) > -1 +-# endif +- }; +-#endif ++#elif defined(__EDG_VERSION__) ++ enum { n = aux::dependent_unsigned<T>::value > -1 }; ++#elif defined(BOOST_GCC) ++ enum { n1 }; ++ enum { n2 }; ++ enum { n = n1 != n2 }; ++#else ++ enum { n = sizeof(T) > -1 }; ++#endif + }; + + #if defined(BOOST_MSVC) + +Diff finished. Tue Jan 20 12:45:03 2015 diff --git a/boost/patches/boost-1.57.0-python-abi_letters.patch b/boost/patches/boost-1.57.0-python-abi_letters.patch new file mode 100644 index 0000000..7df3ee7 --- /dev/null +++ b/boost/patches/boost-1.57.0-python-abi_letters.patch @@ -0,0 +1,62 @@ +--- boost_1_57_0/tools/build/src/tools/python.jam 2013-05-21 06:14:18.000000000 +0200 ++++ boost_1_55_0/tools/build/src/tools/python.jam 2014-05-29 19:09:12.115413877 +0200 +@@ -94,7 +94,7 @@ feature.feature pythonpath : : free opti + # using python : 2.3 : /usr/local/bin/python ; + # + rule init ( version ? : cmd-or-prefix ? : includes * : libraries ? +- : condition * : extension-suffix ? ) ++ : condition * : extension-suffix ? : abi-letters ? ) + { + project.push-current $(.project) ; + +@@ -107,7 +107,7 @@ rule init ( version ? : cmd-or-prefix ? + } + } + +- configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) ; ++ configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) : $(abi-letters) ; + + project.pop-current ; + } +@@ -653,7 +653,7 @@ local rule system-library-dependencies ( + + # Declare a target to represent Python's library. + # +-local rule declare-libpython-target ( version ? : requirements * ) ++local rule declare-libpython-target ( version ? : requirements * : abi-letters ? ) + { + # Compute the representation of Python version in the name of Python's + # library file. +@@ -677,13 +677,13 @@ local rule declare-libpython-target ( ve + } + + # Declare it. +- lib python.lib : : <name>python$(lib-version) $(requirements) ; ++ lib python.lib : : <name>python$(lib-version)$(abi-letters) $(requirements) ; + } + + + # Implementation of init. + local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? : +- condition * : extension-suffix ? ) ++ condition * : extension-suffix ? : abi-letters ? ) + { + local prefix ; + local exec-prefix ; +@@ -699,6 +699,7 @@ local rule configure ( version ? : cmd-o + extension-suffix ?= _d ; + } + extension-suffix ?= "" ; ++ abi-letters ?= "" ; + + # Normalize and dissect any version number. + local major-minor ; +@@ -922,7 +923,7 @@ local rule configure ( version ? : cmd-o + } + else + { +- declare-libpython-target $(version) : $(target-requirements) ; ++ declare-libpython-target $(version) : $(target-requirements) : $(abi-letters) ; + + # This is an evil hack. On, Windows, when Python is embedded, nothing + # seems to set up sys.path to include Python's standard library diff --git a/boost/patches/boost-1.57.0-python-libpython_dep.patch b/boost/patches/boost-1.57.0-python-libpython_dep.patch new file mode 100644 index 0000000..57bfc26 --- /dev/null +++ b/boost/patches/boost-1.57.0-python-libpython_dep.patch @@ -0,0 +1,13 @@ +Index: boost_1_57_0/tools/build/src/tools/python.jam +=================================================================== +--- boost_1_57_0/tools/build/src/tools/python.jam (revision 50406) ++++ boost_1_57_0/tools/build/src/tools/python.jam (working copy) +@@ -994,7 +994,7 @@ + else + { + alias python_for_extensions +- : ++ : python + : $(target-requirements) + : + : $(usage-requirements) diff --git a/boost/patches/boost-1.57.0-spirit-unused_typedef.patch b/boost/patches/boost-1.57.0-spirit-unused_typedef.patch new file mode 100644 index 0000000..2829629 --- /dev/null +++ b/boost/patches/boost-1.57.0-spirit-unused_typedef.patch @@ -0,0 +1,19 @@ +diff -up boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp~ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp +--- boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp~ 2014-10-13 12:21:40.000000000 +0200 ++++ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp 2015-01-20 13:25:50.069710766 +0100 +@@ -282,12 +282,12 @@ struct grammar_definition + #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE) + typedef impl::grammar_helper_base<GrammarT> helper_base_t; + typedef grammar_helper_list<GrammarT> helper_list_t; +- typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; + + helper_list_t& helpers = + grammartract_helper_list::do_(self); + + # if defined(BOOST_INTEL_CXX_VERSION) ++ typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; + for (iterator_t i = helpers.rbegin(); i != helpers.rend(); ++i) + (*i)->undefine(self); + # else + +Diff finished. Tue Jan 20 13:25:53 2015 diff --git a/boost/patches/boost-1.58.0-pool-test_linking.patch b/boost/patches/boost-1.58.0-pool-test_linking.patch new file mode 100644 index 0000000..a381370 --- /dev/null +++ b/boost/patches/boost-1.58.0-pool-test_linking.patch @@ -0,0 +1,31 @@ +diff -up boost_1_58_0/libs/pool/test/Jamfile.v2~ boost_1_58_0/libs/pool/test/Jamfile.v2 +--- boost_1_57_0/libs/pool/test/Jamfile.v2~ 2015-07-17 11:36:16.362519826 +0100 ++++ boost_1_57_0/libs/pool/test/Jamfile.v2 2015-07-17 11:37:38.858847388 +0100 +@@ -28,17 +28,17 @@ + local Werr = <toolset>gcc:<warnings-as-errors>on <toolset>msvc:<warnings-as-errors>on ; + + test-suite pool : +- [ run test_simple_seg_storage.cpp : : : $(Werr) <toolset>msvc:<cxxflags>-wd4267 ] +- [ run test_pool_alloc.cpp : : : $(Werr) ] +- [ run pool_msvc_compiler_bug_test.cpp : : : $(Werr) <toolset>msvc:<cxxflags>-wd4512 ] +- [ run test_msvc_mem_leak_detect.cpp : : : $(Werr) ] +- [ run test_bug_3349.cpp : : : $(Werr) ] +- [ run test_bug_4960.cpp : : : $(Werr) ] +- [ run test_bug_1252.cpp : : : $(Werr) ] +- [ run test_bug_2696.cpp : : : $(Werr) ] +- [ run test_bug_5526.cpp : : : $(Werr) ] ++ [ run test_simple_seg_storage.cpp : : : $(Werr) <toolset>msvc:<cxxflags>-wd4267 <library>/boost/system//boost_system ] ++ [ run test_pool_alloc.cpp : : : $(Werr) <library>/boost/system//boost_system ] ++ [ run pool_msvc_compiler_bug_test.cpp : : : $(Werr) <toolset>msvc:<cxxflags>-wd4512 <library>/boost/system//boost_system ] ++ [ run test_msvc_mem_leak_detect.cpp : : : $(Werr) <library>/boost/system//boost_system ] ++ [ run test_bug_3349.cpp : : : $(Werr) <library>/boost/system//boost_system ] ++ [ run test_bug_4960.cpp : : : $(Werr) <library>/boost/system//boost_system ] ++ [ run test_bug_1252.cpp : : : $(Werr) <library>/boost/system//boost_system ] ++ [ run test_bug_2696.cpp : : : $(Werr) <library>/boost/system//boost_system ] ++ [ run test_bug_5526.cpp : : : $(Werr) <library>/boost/system//boost_system ] + [ run test_threading.cpp : : : <threading>multi <library>/boost/thread//boost_thread ] +- [ run ../example/time_pool_alloc.cpp : : : $(Werr) ] ++ [ run ../example/time_pool_alloc.cpp : : : $(Werr) <library>/boost/system//boost_system ] + [ compile test_poisoned_macros.cpp : $(Werr) ] + + # diff --git a/boost/patches/boost-1.58.0-pool.patch0 b/boost/patches/boost-1.58.0-pool.patch0 new file mode 100644 index 0000000..ed8449e --- /dev/null +++ b/boost/patches/boost-1.58.0-pool.patch0 @@ -0,0 +1,120 @@ +Index: boost/pool/pool.hpp +=================================================================== +--- boost/pool/pool.hpp (revision 78317) ++++ boost/pool/pool.hpp (revision 78326) +@@ -27,4 +27,6 @@ + #include <boost/pool/poolfwd.hpp> + ++// std::numeric_limits ++#include <boost/limits.hpp> + // boost::integer::static_lcm + #include <boost/integer/common_factor_ct.hpp> +@@ -358,4 +360,11 @@ + } + ++ size_type max_chunks() const ++ { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool. ++ size_type partition_size = alloc_size(); ++ size_type POD_size = integer::static_lcm<sizeof(size_type), sizeof(void *)>::value + sizeof(size_type); ++ return (std::numeric_limits<size_type>::max() - POD_size) / alloc_size(); ++ } ++ + static void * & nextof(void * const ptr) + { //! \returns Pointer dereferenced. +@@ -377,5 +388,7 @@ + //! the first time that object needs to allocate system memory. + //! The default is 32. This parameter may not be 0. +- //! \param nmax_size is the maximum number of chunks to allocate in one block. ++ //! \param nmax_size is the maximum number of chunks to allocate in one block. ++ set_next_size(nnext_size); ++ set_max_size(nmax_size); + } + +@@ -400,7 +413,7 @@ + } + void set_next_size(const size_type nnext_size) +- { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0. +- //! \returns nnext_size. +- next_size = start_size = nnext_size; ++ { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0. ++ BOOST_USING_STD_MIN(); ++ next_size = start_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nnext_size, max_chunks()); + } + size_type get_max_size() const +@@ -410,5 +423,6 @@ + void set_max_size(const size_type nmax_size) + { //! Set max_size. +- max_size = nmax_size; ++ BOOST_USING_STD_MIN(); ++ max_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nmax_size, max_chunks()); + } + size_type get_requested_size() const +@@ -713,7 +727,7 @@ + BOOST_USING_STD_MIN(); + if(!max_size) +- next_size <<= 1; ++ set_next_size(next_size << 1); + else if( next_size*partition_size/requested_size < max_size) +- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); ++ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); + + // initialize it, +@@ -753,7 +767,7 @@ + BOOST_USING_STD_MIN(); + if(!max_size) +- next_size <<= 1; ++ set_next_size(next_size << 1); + else if( next_size*partition_size/requested_size < max_size) +- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); ++ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); + + // initialize it, +@@ -797,4 +811,6 @@ + //! \returns Address of chunk n if allocated ok. + //! \returns 0 if not enough memory for n chunks. ++ if (n > max_chunks()) ++ return 0; + + const size_type partition_size = alloc_size(); +@@ -845,7 +861,7 @@ + BOOST_USING_STD_MIN(); + if(!max_size) +- next_size <<= 1; ++ set_next_size(next_size << 1); + else if( next_size*partition_size/requested_size < max_size) +- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); ++ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); + + // insert it into the list, +Index: libs/pool/test/test_bug_6701.cpp +=================================================================== +--- libs/pool/test/test_bug_6701.cpp (revision 78326) ++++ libs/pool/test/test_bug_6701.cpp (revision 78326) +@@ -0,0 +1,27 @@ ++/* Copyright (C) 2012 Ãtienne Dupuis ++* ++* Use, modification and distribution is subject to the ++* Boost Software License, Version 1.0. (See accompanying ++* file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) ++*/ ++ ++// Test of bug #6701 (https://svn.boost.org/trac/boost/ticket/6701) ++ ++#include <boost/pool/object_pool.hpp> ++#include <boost/limits.hpp> ++ ++int main() ++{ ++ boost::pool<> p(1024, std::numeric_limits<size_t>::max() / 768); ++ ++ void *x = p.malloc(); ++ BOOST_ASSERT(!x); ++ ++ BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_next_size()); ++ BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_max_size()); ++ ++ void *y = p.ordered_malloc(std::numeric_limits<size_t>::max() / 768); ++ BOOST_ASSERT(!y); ++ ++ return 0; ++} diff --git a/boost/patches/boost-1.59-test-fenv.patch2 b/boost/patches/boost-1.59-test-fenv.patch2 new file mode 100644 index 0000000..df87f56 --- /dev/null +++ b/boost/patches/boost-1.59-test-fenv.patch2 @@ -0,0 +1,32 @@ +commit 2f3b98e640c25fe45ae691a5aa950745380b983e +Author: Jonathan Wakely jwakely@redhat.com +Date: Mon Sep 14 15:05:24 2015 +0100 + + Do not qualify <fenv.h> names that might be macros. + +diff --git a/include/boost/test/impl/execution_monitor.ipp b/include/boost/test/impl/execution_monitor.ipp +index 3a9e779..8b319df 100644 +--- a/include/boost/test/impl/execution_monitor.ipp ++++ b/include/boost/test/impl/execution_monitor.ipp +@@ -1380,8 +1380,8 @@ enable( unsigned mask ) + + return ~old_cw & BOOST_FPE_ALL; + #elif defined(__GLIBC__) && defined(__USE_GNU) && !defined(BOOST_CLANG) && !defined(BOOST_NO_FENV_H) +- ::feclearexcept(BOOST_FPE_ALL); +- int res = ::feenableexcept( mask ); ++ feclearexcept(BOOST_FPE_ALL); ++ int res = feenableexcept( mask ); + return res == -1 ? (unsigned)BOOST_FPE_INV : (unsigned)res; + #else + /* Not Implemented */ +@@ -1417,8 +1417,8 @@ disable( unsigned mask ) + + return ~old_cw & BOOST_FPE_ALL; + #elif defined(__GLIBC__) && defined(__USE_GNU) && !defined(BOOST_CLANG) && !defined(BOOST_NO_FENV_H) +- ::feclearexcept(BOOST_FPE_ALL); +- int res = ::fedisableexcept( mask ); ++ feclearexcept(BOOST_FPE_ALL); ++ int res = fedisableexcept( mask ); + return res == -1 ? (unsigned)BOOST_FPE_INV : (unsigned)res; + #else + /* Not Implemented */ diff --git a/lzip/lzip.nm b/lzip/lzip.nm index 432a298..1a70c06 100644 --- a/lzip/lzip.nm +++ b/lzip/lzip.nm @@ -4,7 +4,7 @@ ###############################################################################
name = lzip -version = 1.16 +version = 1.17 release = 1
groups = Application/File diff --git a/lzo/lzo.nm b/lzo/lzo.nm index 71696af..7bd25af 100644 --- a/lzo/lzo.nm +++ b/lzo/lzo.nm @@ -4,7 +4,7 @@ ###############################################################################
name = lzo -version = 2.06 +version = 2.09 release = 1
groups = Applications/Compression diff --git a/mailcap/mailcap.nm b/mailcap/mailcap.nm index be52d0d..40ac572 100644 --- a/mailcap/mailcap.nm +++ b/mailcap/mailcap.nm @@ -4,8 +4,8 @@ ###############################################################################
name = mailcap -version = 2.1.36 -release = 2 +version = 2.1.45 +release = 1 arch = noarch
groups = System/Base @@ -22,7 +22,7 @@ description certain programs to be able to handle non-text files. end
-source_dl = +source_dl = https://fedorahosted.org/released/mailcap/ sources = %{thisapp}.tar.xz
build diff --git a/mc/mc.nm b/mc/mc.nm index e0978f7..e919854 100644 --- a/mc/mc.nm +++ b/mc/mc.nm @@ -4,7 +4,7 @@ ###############################################################################
name = mc -version = 4.8.12 +version = 4.8.16 release = 1 epoch = 1
diff --git a/mdadm/mdadm.nm b/mdadm/mdadm.nm index 28d7213..533795d 100644 --- a/mdadm/mdadm.nm +++ b/mdadm/mdadm.nm @@ -4,7 +4,7 @@ ###############################################################################
name = mdadm -version = 3.3 +version = 3.4 release = 1
groups = System/Base diff --git a/minicom/minicom.nm b/minicom/minicom.nm index a8add8b..699b94a 100644 --- a/minicom/minicom.nm +++ b/minicom/minicom.nm @@ -4,7 +4,7 @@ ###############################################################################
name = minicom -version = 2.5 +version = 2.7 release = 1
groups = Applications/System @@ -19,7 +19,7 @@ description language, and other features. end
-source_dl = http://alioth.debian.org/frs/download.php/3487/ +source_dl = https://alioth.debian.org/frs/download.php/file/3977/
build requires diff --git a/mtr/mtr.nm b/mtr/mtr.nm index 4d978be..0af23d8 100644 --- a/mtr/mtr.nm +++ b/mtr/mtr.nm @@ -4,7 +4,7 @@ ###############################################################################
name = mtr -version = 0.82 +version = 0.85 release = 1
groups = Applications/Internet @@ -22,6 +22,7 @@ source_dl = ftp://ftp.bitwizard.nl/mtr/ build requires ncurses-devel + glib2-devel end
configure_options += \ diff --git a/nasm/nasm.nm b/nasm/nasm.nm index 9244b0a..f6e6032 100644 --- a/nasm/nasm.nm +++ b/nasm/nasm.nm @@ -4,7 +4,7 @@ ###############################################################################
name = nasm -version = 2.08.01 +version = 2.12.01 release = 1
groups = Development/Languages @@ -18,7 +18,7 @@ description Intel instruction mnemonics and syntax. end
-source_dl = +source_dl = http://www.nasm.us/pub/nasm/releasebuilds/2.12.01/ sources = %{thisapp}.tar.bz2
build diff --git a/tzdata/tzdata.nm b/tzdata/tzdata.nm index 0482afc..4f2ed96 100644 --- a/tzdata/tzdata.nm +++ b/tzdata/tzdata.nm @@ -3,8 +3,8 @@ # Copyright (C) - IPFire Development Team info@ipfire.org # ###############################################################################
-tzdata_version = 2016b -tzcode_version = 2016b +tzdata_version = 2016d +tzcode_version = 2016d
name = tzdata version = %{tzdata_version}
hooks/post-receive -- IPFire 3.x development tree
-
git＠ipfire.org