Commit 0944fc3a authored by Tomo's avatar Tomo
Browse files

armitage: patch for Gradle 8 

Only one more Gradle 6 usage left to go!
parent bc685706

pkgs/by-name/ar/armitage/gradle-8.patch

0 → 100644
+28 −0
Original line number Diff line number Diff line 
Upstream PR: https://github.com/r00t0v3rr1d3/armitage/pull/1

diff --git a/armitage/build.gradle b/armitage/build.gradle

index 43a5d08..50ae084 100644

--- a/armitage/build.gradle

+++ b/armitage/build.gradle

@@ -19,7 +19,7 @@ jar {

     from {

         configurations.compileClasspath.filter { it.exists() }.collect { it.isDirectory() ? it : zipTree(it) }

     }

-    archiveName 'armitage.jar'

+    archiveFileName.set 'armitage.jar'

 }

 

 dependencies {

diff --git a/cortana/build.gradle b/cortana/build.gradle

index c7d08bb..aa54635 100644

--- a/cortana/build.gradle

+++ b/cortana/build.gradle

@@ -19,7 +19,8 @@ jar {

     from {

         configurations.compileClasspath.filter { it.exists() }.collect { it.isDirectory() ? it : zipTree(it) }

     }

-    archiveName 'cortana.jar'

+    duplicatesStrategy DuplicatesStrategy.INCLUDE

+    archiveFileName.set 'cortana.jar'

 }

 

 dependencies {

pkgs/by-name/ar/armitage/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
, fetchurl

, fetchFromGitHub

, jdk11

, gradle_6

, gradle

, metasploit

, makeWrapper

, makeDesktopItem
@@ -15,8 +15,6 @@ let 
  pname = "armitage";

  version = "unstable-2022-12-05";



  gradle = gradle_6;



  src = fetchFromGitHub {

    owner = "r00t0v3rr1d3";

    repo = "armitage";
@@ -45,6 +43,8 @@ let 
      url = "https://gitlab.com/kalilinux/packages/armitage/-/raw/042beb7494a10227761ecb3ddabf4019bbb78681/debian/patches/fix-meterpreter.patch";

      hash = "sha256-p4fs5xFdC2apW0U8x8u9S4p5gq3Eiv+0E4CGccQZYKY=";

    })

    # Update for Gradle 8 (https://github.com/r00t0v3rr1d3/armitage/pull/1)

    ./gradle-8.patch

  ];



in