public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openjdk7: replace vulnerable cups version (#17214)

Browse Source 
Fixes #7407.
Also uses the nixpkgs version of cups, not a static one that is never
maintained.
This commit is contained in:
Profpatsch 2016-07-28 03:23:21 +02:00 committed by Franz Pletz
parent 2ef1c6bbbb
commit 632411c2b6
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/compilers/openjdk/7.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, unzip, zip, procps, coreutils, alsaLib, ant, freetype { 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 , fontconfig, cpio, cacert, perl, setJavaClassPath
, minimal ? false , minimal ? false
}: }:
@ -24,11 +24,6 @@ let
# On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.
paxflags = if stdenv.isi686 then "msp" else "m"; 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"; baseurl = "http://hg.openjdk.java.net/jdk7u/jdk7u";
repover = "jdk7u${update}-b${build}"; repover = "jdk7u${update}-b${build}";
jdk7 = fetchurl { jdk7 = fetchurl {
@ -89,7 +84,7 @@ let
sed -i "s@/bin/echo -e@${coreutils}/bin/echo -e@" \ sed -i "s@/bin/echo -e@${coreutils}/bin/echo -e@" \
{jdk,corba}/make/common/shared/Defs-utils.gmk {jdk,corba}/make/common/shared/Defs-utils.gmk
tar xf ${cupsSrc} tar xf ${cups.src}
cupsDir=$(echo $(pwd)/cups-*) cupsDir=$(echo $(pwd)/cups-*)
makeFlagsArray+=(CUPS_HEADERS_PATH=$cupsDir) makeFlagsArray+=(CUPS_HEADERS_PATH=$cupsDir)
''; '';