Commit Graph

92 Commits

Author SHA1 Message Date
William A. Kennington III
baf30718ca Merge branch 'master.upstream' into staging.upstream 2015-11-18 02:36:33 -08:00
Vladimír Čunát
31aa281919 libpng12: security update 1.2.53 -> 1.2.54
Part of fix for #11030.
Also refactor meta.
2015-11-17 12:57:33 +01:00
Vladimír Čunát
cc86857601 libpng: security and maintenance 1.6.18 -> 1.6.19
Fixes #11030, CVE-2015-{7981,8126}.
2015-11-16 08:12:08 +01:00
William A. Kennington III
f30a8f78a8 libpng: 1.2.52 -> 1.2.53 2015-08-05 23:37:07 -07:00
William A. Kennington III
8164d28315 libpng: 1.6.16 -> 1.6.18
Also enable apng by default
2015-08-05 23:26:00 -07:00
Vladimír Čunát
e72b405104 libpng-1.2: maintenance update
Also drop xz input, as it isn't needed (stdenv unpacks xz by itself).
2015-07-30 13:48:59 +02:00
Vladimír Čunát
e942b5892d libpng15: remove unused version 2015-07-30 13:48:58 +02:00
Vladimír Čunát
5d903d850a libpng: security update (no CVE yet)
http://www.securitytracker.com/id/1031444
2014-12-25 11:36:21 +01:00
Vladimír Čunát
67c49ad3e3 libpng: bugfix update
This might fix the often-seen error messages.
2014-10-23 17:49:19 +02:00
Mateusz Kowalczyk
aafca4dd51 Add a few meta.branch to please monitor 2014-09-30 10:07:49 +01:00
Mateusz Kowalczyk
fe86a03a1c libpng: use spdx licensing method 2014-09-21 18:53:20 +01:00
Mateusz Kowalczyk
56d9b3c4d8 libpng15: update from 1.5.18 to 1.5.19 2014-09-21 18:47:08 +01:00
Vladimír Čunát
20aacf89a3 libpng: code-cleanup update 2014-08-30 10:40:49 +02:00
Vladimír Čunát
6de9700ccc libpng: minor update 1.6.10 -> .12 2014-06-17 09:00:29 +02:00
aszlig
625d7b9043
Merge pull request #1928 from 'cross-win-osx'.
This includes a lot of fixes for cross-building to Windows and Mac OS X
and could possibly fix things even for non-cross-builds, like for
example OpenSSL on Windows.

The main reason for merging this in 14.04 already is that we already
have runInWindowsVM in master and it doesn't work until we actually
cross-build Cygwin's setup binary as the upstream version is a fast
moving target which gets _overwritten_ on every new release.

Conflicts:
	pkgs/top-level/all-packages.nix
2014-04-21 10:00:35 +02:00
Jaka Hudoklin
c3524a8dd6 optipng: use system libpng & zlib, fix cross builds and add support for static builds 2014-04-01 01:43:56 +02:00
Vladimír Čunát
ef32fbe6a4 libpng12, libpng15: minor updates of legacy versions 2014-03-13 22:32:17 +01:00
Vladimír Čunát
f5464c2982 libpng: update 1.6.9 -> .10 to fix CVE-2014-0333 2014-03-13 22:00:41 +01:00
aszlig
cdaced58ae
libpng12/cross: Don't add zlib for Darwin builds.
Cross builds for Darwin already include the CoreFoundation and the
libraries from XCode, so zlib already exists on that platform.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:00:48 +01:00
Vladimír Čunát
159144c1e9 libpng(_apng): maintenance update 1.6.8 -> .9 2014-02-10 19:01:37 +01:00
Mathijs Kwik
0bf0610d14 libpng: upgrade apng patch .7 -> .8 2013-12-24 10:52:42 +01:00
Vladimír Čunát
f4782016ed libpng: minor update 1.6.7 -> .8
Fixes a potential segfault.
2013-12-21 15:14:05 +01:00
Vladimír Čunát
b98da7c273 libpng: several minor updates 1.6.4 -> 1.6.7
all seem unimportant
2013-11-25 22:24:13 +01:00
Vladimír Čunát
a189a68401 lipng_apng: fix via using the previous patch 2013-09-12 19:12:10 +02:00
Vladimír Čunát
117f2e6683 libpng: minor update 1.6.3 -> .4
Also make myself maintainer.
2013-09-12 17:19:27 +02:00
Vladimír Čunát
625f40151b Merge branch 'master' into x-updates
Conflicts (a little tricky, I did some cleanup of interacting changes):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/libpng/default.nix
	pkgs/tools/package-management/nixops/default.nix
	pkgs/top-level/all-packages.nix
2013-08-02 18:30:53 +02:00
Eelco Dolstra
11b5b06fbd libpng: Update to 1.6.3 2013-07-29 21:39:56 +02:00
Mathijs Kwik
e78b013fe3 libpng: merge apng expression (keep patch disabled by default)
I made sure no rebuild will happen because of this.
Unfortunately this meant merging attrsets instead of just using an
optionalString for postPatch
2013-06-27 21:35:21 +02:00
Vladimír Čunát
2058d95eb4 non-Linux platforms: extend to some important pkgs 2013-06-18 22:03:35 +02:00
Vladimír Čunát
8a1392bd70 libpng: bugfix update 1.6.1 -> 1.6.2 2013-04-25 21:15:54 +02:00
Vladimír Čunát
69418c7418 libpng: minor updates to 1.6.1 and 1.5.15 2013-03-29 00:01:10 +01:00
Vladimír Čunát
0d72174dbd Merge branch stdenv-updates into x-updates
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
2013-02-21 12:43:00 +01:00
Vladimír Čunát
64fd0379c8 libpng: reintroduce 1.5, some pkgs need older 2013-02-16 18:00:28 +01:00
Vladimír Čunát
364a853c99 libpng: major update to 1.6, enable the check phase
It builds on my machine, we'll see what other packages say on it.
2013-02-14 20:53:46 +01:00
Vladimír Čunát
3a2daeee0b libpng minor update 2013-01-29 13:19:06 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra
fae22cb3e9 libpng: Update to 1.5.13 2012-10-16 11:56:31 -04:00
Eelco Dolstra
3aae4ccffa libpng: Update to 1.2.50 and 1.5.12
Addresses CVE-2012-3386.
2012-07-25 11:04:47 -04:00
Eelco Dolstra
32649ce94c * libpng 1.5.10, which includes a fix for CVE-2011-3048.
svn path=/nixpkgs/branches/stdenv-updates/; revision=34010
2012-05-07 20:12:53 +00:00
Yury G. Kudryashov
57fd764a39 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
2012-03-05 10:00:23 +00:00
Yury G. Kudryashov
61e7d39e05 libpng-1.5.9 (see CVE 2011-3026)
svn path=/nixpkgs/branches/libpng15/; revision=32398
2012-02-19 11:23:05 +00:00
Yury G. Kudryashov
313a029f16 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32396
2012-02-19 11:16:24 +00:00
Yury G. Kudryashov
5c6a3faf4e Merge ^/nixpkgs/trunk
svn tried to change libpng/default.nix version, I've changed libpng/12.nix
version manually.

svn path=/nixpkgs/branches/libpng15/; revision=32395
2012-02-19 11:06:00 +00:00
Yury G. Kudryashov
668a505214 libpng-1.2.47 (see CVE 2011-3026)
svn path=/nixpkgs/trunk/; revision=32394
2012-02-19 10:59:31 +00:00
Eelco Dolstra
d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
2012-01-18 20:53:01 +00:00
Yury G. Kudryashov
2ebcb95219 Restore libpng-1.2.x
svn path=/nixpkgs/branches/libpng15/; revision=31440
2012-01-08 19:50:06 +00:00
Yury G. Kudryashov
e957de48b8 libpng-1.5.7
svn path=/nixpkgs/branches/libpng15/; revision=31439
2012-01-08 19:49:56 +00:00
Yury G. Kudryashov
e66134d1fc libpng-1.5.5
svn path=/nixpkgs/branches/libpng15/; revision=29652
2011-10-05 08:13:16 +00:00
Yury G. Kudryashov
bfc84fec9b Add a notice about libpng branch
svn path=/nixpkgs/trunk/; revision=29474
2011-09-24 20:44:11 +00:00
Yury G. Kudryashov
71b331103e libpng-1.5.4
svn path=/nixpkgs/branches/libpng15/; revision=29391
2011-09-20 06:52:43 +00:00