Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'staging'; security /cc #21642
- Loading branch information
Showing
41 changed files
with
261 additions
and
183 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
--- a/include/string 2015/07/13 20:04:56 242056 | ||
+++ b/include/string 2015/07/18 20:40:46 242623 | ||
@@ -1936,7 +1936,12 @@ | ||
template <class _CharT, class _Traits, class _Allocator> | ||
inline _LIBCPP_INLINE_VISIBILITY | ||
basic_string<_CharT, _Traits, _Allocator>::basic_string(const allocator_type& __a) | ||
- : __r_(__a) | ||
+#if _LIBCPP_STD_VER <= 14 | ||
+ _NOEXCEPT_(is_nothrow_copy_constructible<allocator_type>::value) | ||
+#else | ||
+ _NOEXCEPT | ||
+#endif | ||
+: __r_(__a) | ||
{ | ||
#if _LIBCPP_DEBUG_LEVEL >= 2 | ||
__get_db()->__insert_c(this); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
{ stdenv, fetchurl, tcl, tk, fetchpatch } : | ||
|
||
stdenv.mkDerivation rec { | ||
version = "8.4.3"; | ||
name = "tix-${version}"; | ||
src = fetchurl { | ||
url = "mirror://sourceforge/tix/tix/8.4.3/Tix8.4.3-src.tar.gz"; | ||
sha256 = "1jq3dkyk9mqkj4cg7mdk5r0cclqsby9l2b7wrysi0zk5yw7h8bsn"; | ||
}; | ||
patches = [ | ||
(fetchpatch { | ||
name = "tix-8.4.3-tcl8.5.patch"; | ||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-tcltk/tix/files/tix-8.4.3-tcl8.5.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d"; | ||
sha256 = "0wzqmcxxq0rqpnjgxz10spw92yhfygnlwv0h8pcx2ycnqiljz6vj"; | ||
}) | ||
] ++ stdenv.lib.optional (tcl.release == "8.6") | ||
(fetchpatch { | ||
name = "tix-8.4.3-tcl8.6.patch"; | ||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-tcltk/tix/files/tix-8.4.3-tcl8.6.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d"; | ||
sha256 = "1jaz0l22xj7x1k4rb9ia6i1psnbwk4pblgq4gfvya7gg7fbb7r36"; | ||
}) | ||
; | ||
buildInputs = [ tcl tk ]; | ||
# the configure script expects to find the location of the sources of | ||
# tcl and tk in {tcl,tk}Config.sh | ||
# In fact, it only needs some private headers. We copy them in | ||
# the private_headers folders and trick the configure script into believing | ||
# the sources are here. | ||
preConfigure = '' | ||
mkdir -p private_headers/generic | ||
< ${tcl}/lib/tclConfig.sh sed "s@TCL_SRC_DIR=.*@TCL_SRC_DIR=private_headers@" > tclConfig.sh | ||
< ${tk}/lib/tkConfig.sh sed "s@TK_SRC_DIR=.*@TK_SRC_DIR=private_headers@" > tkConfig.sh | ||
for i in ${tcl}/include/* ${tk.dev}/include/*; do | ||
ln -s $i private_headers/generic; | ||
done; | ||
''; | ||
configureFlags = '' | ||
--with-tclinclude=${tcl}/include | ||
--with-tclconfig=. | ||
--with-tkinclude=${tk.dev}/include | ||
--with-tkconfig=. | ||
--libdir=''${prefix}/lib | ||
''; | ||
|
||
meta = with stdenv.lib; { | ||
description = "A widget library for Tcl/Tk"; | ||
homepage = http://tix.sourceforge.net/; | ||
platforms = platforms.all; | ||
license = with licenses; [ | ||
bsd2 # tix | ||
gpl2 # patches from portage | ||
]; | ||
}; | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
{ stdenv, fetchurl, bison, m4 }: | ||
|
||
stdenv.mkDerivation rec { | ||
name = "flex-2.6.1"; | ||
|
||
src = fetchurl { | ||
url = "https://github.com/westes/flex/releases/download/v2.6.1/flex-2.6.1.tar.gz"; | ||
sha256 = "0fy14c35yz2m1n1m4f02by3501fn0cca37zn7jp8lpp4b3kgjhrw"; | ||
}; | ||
|
||
buildInputs = [ bison ]; | ||
|
||
propagatedNativeBuildInputs = [ m4 ]; | ||
|
||
postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) '' | ||
sed -i Makefile -e 's/-no-undefined//;' | ||
''; | ||
|
||
crossAttrs = { | ||
|
||
# disable tests which can't run on build machine | ||
postPatch = '' | ||
substituteInPlace Makefile.in --replace "tests" " "; | ||
''; | ||
|
||
preConfigure = '' | ||
export ac_cv_func_malloc_0_nonnull=yes | ||
export ac_cv_func_realloc_0_nonnull=yes | ||
''; | ||
}; | ||
|
||
meta = { | ||
homepage = https://github.com/westes/flex; | ||
description = "A fast lexical analyser generator"; | ||
platforms = stdenv.lib.platforms.unix; | ||
}; | ||
} |
Oops, something went wrong.