cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

storm: 2.4.0 -> 2.6.2

Browse source 
Fixes CVE-2023-43123
https://lists.apache.org/thread/88oc1vqfjtr29cz5xts0v2wm5pmhbm0l

Changes:
https://storm.apache.org/2023/08/04/storm250-released.html
https://storm.apache.org/2023/11/22/storm260-released.html
https://storm.apache.org/2024/02/02/storm261-released.html
https://storm.apache.org/2024/04/05/storm262-released.html
This commit is contained in:
Thomas Gerbet 2024-04-20 00:19:35 +02:00
parent 92d295f588
commit 0136fde515
1 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
pkgs/servers/computing/storm/default.nix
View file

@ -1,26 +1,27 @@
{ stdenv, lib, fetchurl, zip, unzip { stdenv, lib, fetchurl, zip, unzip
, jdk, python2 , jdk, python3
, confFile ? "" , confFile ? ""
, extraLibraryPaths ? [] , extraLibraryPaths ? []
, extraJars ? [] , extraJars ? []
, testers
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "apache-storm"; pname = "apache-storm";
version = "2.4.0"; version = "2.6.2";
name = "${pname}-${version}"; name = "${finalAttrs.pname}-${finalAttrs.version}";
src = fetchurl { src = fetchurl {
url = "mirror://apache/storm/${name}/${name}.tar.gz"; url = "mirror://apache/storm/${finalAttrs.name}/${finalAttrs.name}.tar.gz";
sha256 = "sha256-VFNcaISPBRMGR5l/P6/pGnK7lHClDW2AmXJ00gzxwMY="; hash = "sha256-ZAwsVKWTzc/++UQTNnOHdK5hiDDT5j6453DCLWi+7TA=";
}; };
nativeBuildInputs = [ zip unzip ]; nativeBuildInputs = [ zip unzip ];
installPhase = '' installPhase = ''
mkdir -p $out/share/${name} mkdir -p $out/share/${finalAttrs.name}
mv public $out/docs mv public $out/docs
mv examples $out/share/${name}/. mv examples $out/share/${finalAttrs.name}/.
mv external extlib* lib $out/. mv external extlib* lib $out/.
mv conf bin $out/. mv conf bin $out/.
@ -28,23 +29,23 @@ stdenv.mkDerivation rec {
''; '';
fixupPhase = '' fixupPhase = ''
patchShebangs $out
# Fix python reference # Fix python reference
sed -i \ sed -i \
-e '19iPYTHON=${python2}/bin/python' \ -e '19iPYTHON=${python3}/bin/python' \
-e 's|#!/usr/bin/.*python|#!${python2}/bin/python|' \ -e 's|#!/usr/bin/.*python|#!${python3}/bin/python|' \
$out/bin/storm $out/bin/storm
sed -i \ sed -i \
-e 's|#!/usr/bin/.*python|#!${python2}/bin/python|' \ -e 's|#!/usr/bin/.*python|#!${python3}/bin/python|' \
-e "s|STORM_CONF_DIR = .*|STORM_CONF_DIR = os.getenv('STORM_CONF_DIR','$out/conf')|" \ -e "s|STORM_CONF_DIR = .*|STORM_CONF_DIR = os.getenv('STORM_CONF_DIR','$out/conf')|" \
-e 's|STORM_LOG4J2_CONF_DIR =.*|STORM_LOG4J2_CONF_DIR = os.path.join(STORM_CONF_DIR, "log4j2")|' \ -e 's|STORM_LOG4J2_CONF_DIR =.*|STORM_LOG4J2_CONF_DIR = os.path.join(STORM_CONF_DIR, "log4j2")|' \
$out/bin/storm.py $out/bin/storm.py
# Default jdk location # Default jdk location
sed -i -e 's|#.*export JAVA_HOME=.*|export JAVA_HOME="${jdk.home}"|' \ sed -i -e 's|export JAVA_HOME=.*|export JAVA_HOME="${jdk.home}"|' \
$out/conf/storm-env.sh $out/conf/storm-env.sh
ls -lh $out/lib unzip $out/lib/storm-client-${finalAttrs.version}.jar defaults.yaml;
unzip $out/lib/storm-client-${version}.jar defaults.yaml; zip -d $out/lib/storm-client-${finalAttrs.version}.jar defaults.yaml;
zip -d $out/lib/storm-client-${version}.jar defaults.yaml;
sed -i \ sed -i \
-e 's|java.library.path: .*|java.library.path: "${lib.concatStringsSep ":" extraLibraryPaths}"|' \ -e 's|java.library.path: .*|java.library.path: "${lib.concatStringsSep ":" extraLibraryPaths}"|' \
-e 's|storm.log4j2.conf.dir: .*|storm.log4j2.conf.dir: "conf/log4j2"|' \ -e 's|storm.log4j2.conf.dir: .*|storm.log4j2.conf.dir: "conf/log4j2"|' \
@ -59,6 +60,11 @@ stdenv.mkDerivation rec {
dontStrip = true; dontStrip = true;
passthru.tests.version = testers.testVersion {
package = finalAttrs.finalPackage;
command = "storm version";
};
meta = with lib; { meta = with lib; {
homepage = "https://storm.apache.org/"; homepage = "https://storm.apache.org/";
description = "Distributed realtime computation system"; description = "Distributed realtime computation system";
@ -67,4 +73,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ edwtjo vizanto ]; maintainers = with maintainers; [ edwtjo vizanto ];
platforms = with platforms; unix; platforms = with platforms; unix;
}; };
} })