diff options
| author | Profpatsch <mail@profpatsch.de> | 2016-07-28 03:23:21 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-07-28 03:23:21 +0200 |
| commit | 632411c2b63b576e6d42f68f5588288f85a629d4 (patch) | |
| tree | 1868711958c517dab87217c7a2b423c1757d82a0 /pkgs/development/compilers/openjdk | |
| parent | 2ef1c6bbbbd3d04f59f15384530af0009eb08167 (diff) | |
| download | nixlib-632411c2b63b576e6d42f68f5588288f85a629d4.tar nixlib-632411c2b63b576e6d42f68f5588288f85a629d4.tar.gz nixlib-632411c2b63b576e6d42f68f5588288f85a629d4.tar.bz2 nixlib-632411c2b63b576e6d42f68f5588288f85a629d4.tar.lz nixlib-632411c2b63b576e6d42f68f5588288f85a629d4.tar.xz nixlib-632411c2b63b576e6d42f68f5588288f85a629d4.tar.zst nixlib-632411c2b63b576e6d42f68f5588288f85a629d4.zip | |
openjdk7: replace vulnerable cups version (#17214)
Fixes #7407. Also uses the nixpkgs version of cups, not a static one that is never maintained.
Diffstat (limited to 'pkgs/development/compilers/openjdk')
| -rw-r--r-- | pkgs/development/compilers/openjdk/7.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/development/compilers/openjdk/7.nix b/pkgs/development/compilers/openjdk/7.nix index de803a5d90c5..5426b0162a72 100644 --- a/pkgs/development/compilers/openjdk/7.nix +++ b/pkgs/development/compilers/openjdk/7.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, unzip, zip, procps, coreutils, alsaLib, ant, freetype -, which, bootjdk, nettools, xorg, file +, which, bootjdk, nettools, xorg, file, cups , fontconfig, cpio, cacert, perl, setJavaClassPath , minimal ? false }: @@ -24,11 +24,6 @@ let # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. paxflags = if stdenv.isi686 then "msp" else "m"; - cupsSrc = fetchurl { - url = http://ftp.easysw.com/pub/cups/1.5.4/cups-1.5.4-source.tar.bz2; - md5 = "de3006e5cf1ee78a9c6145ce62c4e982"; - }; - baseurl = "http://hg.openjdk.java.net/jdk7u/jdk7u"; repover = "jdk7u${update}-b${build}"; jdk7 = fetchurl { @@ -89,7 +84,7 @@ let sed -i "s@/bin/echo -e@${coreutils}/bin/echo -e@" \ {jdk,corba}/make/common/shared/Defs-utils.gmk - tar xf ${cupsSrc} + tar xf ${cups.src} cupsDir=$(echo $(pwd)/cups-*) makeFlagsArray+=(CUPS_HEADERS_PATH=$cupsDir) ''; |