Commit Graph

70 Commits

Author SHA1 Message Date
Vladimír Čunát
50fccad582 Merge branch 'staging' into closure-size 2016-04-10 09:33:25 +02:00
Nikolay Amiantov
cdc5326a31 pcre: cleanup a little 2016-04-09 02:48:14 +03:00
Micxjo Funkcio
1e2fe7e07d pcre: patch CVE-2016-1283
This fixes CVE-2016-1283, which allows remote attackers to cause
a denial of service (heap-based buffer overflow) or possibly
have unspecified other impact via a crafted regular expression.

https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-1283
2016-04-09 02:43:41 +03:00
Vladimír Čunát
d1df28f8e5 Merge 'staging' into closure-size
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
Nikolay Amiantov
c091e61a09 pcre: add 16- and 32-bit character size versions 2016-03-30 22:22:51 +03:00
Vladimír Čunát
09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Michiel Leenaars
32136a0247 pcre: 8.37 with patches -> 8.38 2016-02-08 20:32:03 +01:00
Luca Bruno
e289717414 rename moveToOutput and propagatedBuildInputs 2015-12-02 10:05:36 +01:00
Vladimír Čunát
30845d07d8 pcre: separate variants of the library
- don't include the cxx variant in the default build,
  as it depends on libstdc++ (and it seems rarely used anyway)
- allow building pcre16 and pcre32 variants;
  pcre16 is the one needed by qt*, I think
- share the basic libs with all of the variants
2015-10-28 11:50:06 +01:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Eelco Dolstra
2896861c7e pcre: Smaller patch for CVE-2015-3210, CVE-2015-5073 2015-09-25 11:53:19 +02:00
Eelco Dolstra
298ec05e74 Revert "pcre: Updates to fix a number of vulnerabilities"
This reverts commit 453b986d2f. Such
large patches should not be included in the repo.
2015-09-25 11:38:34 +02:00
Eelco Dolstra
72aa458285 Revert "pcre: Fix patch method"
This reverts commit fb30776a77.
2015-09-25 11:38:26 +02:00
William A. Kennington III
fb30776a77 pcre: Fix patch method 2015-09-17 15:20:49 -07:00
William A. Kennington III
453b986d2f pcre: Updates to fix a number of vulnerabilities
- CVE-2015-3210
  - CVE-2015-5073
  - http://seclists.org/oss-sec/2015/q3/295
2015-09-17 14:31:05 -07:00
Eelco Dolstra
e1f78bf677 More docs/manpages in separate outputs 2015-07-27 00:27:54 +02:00
William A. Kennington III
6acab0228f pcre: 8.36 -> 8.37 2015-05-04 23:20:13 -07:00
Vladimír Čunát
bf414c9d4f Merge 'staging' into closure-size
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
2015-04-18 11:22:20 +02:00
Dan Peebles
e25150bb10 No need for this hack anymore 2015-02-18 22:18:57 -05:00
Eelco Dolstra
2bb69fcedd pcre: Update to 8.36 2014-10-06 20:49:10 +02:00
Nixpkgs Monitor
a71744392b pcre: update from 8.34 to 8.35 2014-09-06 20:10:37 +02:00
Vladimír Čunát
a70180ba73 mutiout: make it builtin 2014-08-30 08:27:43 +02:00
Vladimír Čunát
4dccb224c5 WIP2 2014-08-26 01:10:56 +02:00
Vladimír Čunát
96cec2a7bd Merge 'staging' into multiple-outputs
Conflicts:
	pkgs/applications/audio/flac/default.nix
	pkgs/build-support/gcc-wrapper/builder.sh
	pkgs/development/libraries/apr-util/default.nix
	pkgs/development/libraries/apr/default.nix
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/builder.sh
	pkgs/development/libraries/glibc/2.17/locales.nix
	pkgs/development/libraries/libjpeg/default.nix
	pkgs/development/libraries/libogg/default.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/libvorbis/default.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/development/web/nodejs/default.nix
	pkgs/os-specific/linux/pam/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/stdenv/generic/setup.sh
	pkgs/stdenv/linux/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
aszlig
e64b342fa8
Use mingw-w64 for 32bit Windows builds as well.
Mingw(32) is rather poorly maintaned and has quite a lot of bugs. And
because our Windows cross builds were also poorly maintained and most of
the cross-tests were broken as well, I'm just taking this step and try
to switch to mingw-w64 for everything "cross Windows".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-03 22:38:48 +01:00
aszlig
d0142e9b09
pcre/cross: Enable support for winpthreads.
That way we're able to build with the JIT compiler enabled.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-02-24 07:26:24 +01:00
Peter Simons
bccc76f290 pcre: update to version 8.34 2014-01-13 17:05:07 +01:00
Vladimír Čunát
59a5f6307d pcre: disable tests for freeBSDs, as we're running out of stack 2013-10-08 20:58:34 +02:00
Vladimír Čunát
8a0931c5c3 pcre: minor update 8.32 -> 8.33 2013-06-30 09:00:11 +02:00
Eelco Dolstra
afebababac pcre: Split into multiple outputs 2013-06-11 15:28:30 +02:00
Danny Wilson
867ea1f8fe Update to PCRE 8.32 with JIT enabled 2013-02-28 20:04:02 +01:00
Peter Simons
592e4abe2b pcre: update library to version 8.31 2012-11-21 16:08:01 +01:00
Michael Raskin
901574fe8a Julia language: update to a fresh version
Update julia and some of its dependencies

Split PCRE because a lot of packages depend on it and I am not sure we
want to test them in a hurry (and Julia specifies exact version).
2012-08-02 17:48:36 +04:00
Ludovic Courtès
0524b60614 PCRE: Disable tests on Cygwin.
svn path=/nixpkgs/trunk/; revision=34219
2012-05-24 15:03:54 +00:00
Eelco Dolstra
bad4ed8717 * PCRE updated to 8.21. Also enable Unicode support by default, since
it only increases the size of the library a little bit.

svn path=/nixpkgs/branches/stdenv-updates/; revision=30886
2011-12-14 13:36:38 +00:00
Lluís Batlle i Rossell
fca582bff0 Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages
svn path=/nixpkgs/branches/stdenv-updates/; revision=24155
2010-10-07 21:21:31 +00:00
Peter Simons
d095fbb13e pkgs/development/libraries/pcre: fixed build on Darwin
The gcc version used on Darwin crashes while compiling the C++ interface
of PCRE. Building that code with -O0 avoids the crash.

svn path=/nixpkgs/trunk/; revision=24107
2010-10-06 10:29:45 +00:00
Peter Simons
2291f661b0 pkgs/development/libraries/pcre: fixed misspelled CPPFLAGS
svn path=/nixpkgs/branches/stdenv-updates/; revision=24082
2010-10-05 15:35:55 +00:00
Peter Simons
d61c959049 pkgs/development/libraries/pcre: merged recent changes from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=24076
2010-10-05 13:57:31 +00:00
Eelco Dolstra
d845bf6b8c * Revert last two commits, they should be in the stdenv-branch.
svn path=/nixpkgs/trunk/; revision=24075
2010-10-05 13:49:54 +00:00
Peter Simons
dd6e852f3e pkgs/development/libraries/pcre: enable regression test suite
svn path=/nixpkgs/trunk/; revision=24074
2010-10-05 13:48:37 +00:00
Peter Simons
5649af8523 pkgs/development/libraries/pcre: fixed build on Darwin
The gcc version used on Darwin fails to compile the C++ interface to the PCRE
library when optimizations are enabled. Building C++ code with -O0 remedies the
problem. This is unsatisfactory, though, because the resulting library is
likely to perform more poorly than it would if built with -O2 or -O3.

svn path=/nixpkgs/trunk/; revision=24072
2010-10-05 13:45:53 +00:00
Peter Simons
1171bb1dca pkgs/development/libraries/pcre: updated to version 8.10
svn path=/nixpkgs/branches/stdenv-updates/; revision=24070
2010-10-05 13:16:53 +00:00
Peter Simons
00dd2f39ed pkgs/development/libraries/pcre: updated the meta section and enabled hydra builds of this package
svn path=/nixpkgs/trunk/; revision=24069
2010-10-05 13:12:49 +00:00
Peter Simons
5a928cc584 pkgs/development/libraries/pcre: updated to version 8.02
svn path=/nixpkgs/branches/stdenv-updates/; revision=21908
2010-05-20 10:32:56 +00:00
Eelco Dolstra
94d7d1fdbb * Got rid of all --disable-static flags; they're redundant now.
* Also a bunch of style cleanups (tabs, with args, ...).

svn path=/nixpkgs/branches/stdenv-updates/; revision=15235
2009-04-21 23:18:09 +00:00
Eelco Dolstra
51760b17b3 * PCRE 7.8.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14710
2009-03-25 17:41:02 +00:00
Eelco Dolstra
e31341510d * Merged from the trunk. Let's see how well this works with
Subversion 1.5...

svn path=/nixpkgs/branches/stdenv-updates/; revision=13601
2008-12-10 09:59:21 +00:00
Eelco Dolstra
19ebc883e1 * pcre 7.8.
svn path=/nixpkgs/branches/stdenv-updates/; revision=12984
2008-10-07 12:41:36 +00:00