Page MenuHomeSolus
Files F11047878

D9011.id21685.diff
No OneTemporary
Actions

D9011.id21685.diff
View Options

diff --git a/files/0001-disable-deb-rpm-minimize.patch b/files/0001-disable-deb-rpm-minimize.patch
deleted file mode 100644
--- a/files/0001-disable-deb-rpm-minimize.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/build.gradle b/build.gradle
-index f87bcb47..4f08e98f 100644
---- a/build.gradle
-+++ b/build.gradle
-@@ -98,20 +98,7 @@ def packageTask(def platform, def moreJars, def moreLibs, Closure doMore) {
- )
- with jar
-
-- def rtJar = new File(System.getProperty('java.home') + "/jre/lib/rt.jar")
-- if (!rtJar.exists()) rtJar = new File(System.getProperty('java.home') + "/lib/rt.jar") // support for Zulu JVM in Github workflow
-- if (!rtJar.exists()) rtJar = new File('/usr/lib/jvm/java-8-oracle/jre/lib/rt.jar') // try Debian/Ubuntu version of Java 8 if current Java doesn't have rt.jar
-- if (!rtJar.exists()) rtJar = new File('/usr/lib/jvm/java-1.8.0-openjdk-amd64/jre/lib/rt.jar') // try Debian/Ubuntu version of OpenJDK 8
-- // if (!rtJar.exists()) rtJar = new File('/usr/lib/jvm/java-11-openjdk-amd64/jmods/java.base.jmod') // Java 9+ needs more jmods (awt)
--
-- if (rtJar.exists() && platform != "any") {
-- println "Using $rtJar for proguard minimization"
-- finalizedBy minimizeTask(rtJar, platform, doMore)
-- }
-- else {
-- println "WARNING: not minimizing, Java8 rt.jar not found on the system"
-- doLast(doMore)
-- }
-+ doLast(doMore)
- }
- }
-
-@@ -194,12 +181,12 @@ def rpm(def platform, def arch) {
- }
-
- packageTask('linux64', [], 'ext/rocksaw/lib/linux64/librocksaw.so') {
-- deb('linux64', 'amd64')
-- rpm('linux64', 'x86_64')
-+ //deb('linux64', 'amd64')
-+ //rpm('linux64', 'x86_64')
- }
-
- packageTask('any', [], []) {
-- deb('any', 'all', 'libswt-gtk-4-java, libswt-cairo-gtk-4-jni,')
-+ //deb('any', 'all', 'libswt-gtk-4-java, libswt-cairo-gtk-4-jni,')
- }
-
- packageTask('win32', 'lib/jna-win32.jar', 'ext/rocksaw/lib/rocksaw.dll') {
diff --git a/files/fix-build-gradle.patch b/files/fix-build-gradle.patch
new file mode 100644
--- /dev/null
+++ b/files/fix-build-gradle.patch
@@ -0,0 +1,49 @@
+diff --git a/build.gradle b/build.gradle
+index 4d6067c5..6ddfb425 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -9,7 +9,6 @@ buildscript {
+
+ plugins {
+ id "java"
+- id "com.palantir.git-version" version "0.12.2"
+ }
+
+ def osName = System.getProperty("os.name")
+@@ -18,7 +17,7 @@ def platform = osName.contains("Linux") ? 'linux' + (is64 ? '64' : '') :
+ osName.contains("Windows") ? 'win' + (is64 ? '64' : '32') :
+ osName.contains("OS X") ? 'mac' : 'unknown'
+
+-version = gitVersion()
++version = ipscanVersion
+ sourceCompatibility = 1.8
+ targetCompatibility = 1.8
+
+@@ -99,10 +98,7 @@ def packageTask(String platform, def moreJars = [], def moreLibs = [], Closure d
+ )
+ with jar
+
+- if (platform != "any")
+- finalizedBy minimizeTask(platform, doMore)
+- else
+- doLast(doMore)
++ doLast(doMore)
+ }
+ }
+
+@@ -193,12 +189,12 @@ def rpm(def platform, def arch) {
+ }
+
+ packageTask('linux64', [], 'ext/rocksaw/lib/linux64/librocksaw.so') {
+- deb('linux64', 'amd64')
+- rpm('linux64', 'x86_64')
++ // deb('linux64', 'amd64')
++ // rpm('linux64', 'x86_64')
+ }
+
+ packageTask('any') {
+- deb('any', 'all', 'libswt-gtk-4-java, libswt-cairo-gtk-4-jni,')
++ // deb('any', 'all', 'libswt-gtk-4-java, libswt-cairo-gtk-4-jni,')
+ }
+
+ packageTask('win32', 'lib/jna-win32.jar', 'ext/rocksaw/lib/rocksaw.dll') {
diff --git a/files/ipscan b/files/ipscan
--- a/files/ipscan
+++ b/files/ipscan
@@ -1,3 +1,7 @@
#!/bin/sh
-/usr/lib64/openjdk-8/bin/java -jar /usr/share/ipscan/ipscan.jar
+if [ -z "$JAVA_HOME" ]; then
+ export JAVA_HOME=/usr/lib64/openjdk-11
+fi
+
+exec $JAVA_HOME/bin/java -jar /usr/share/ipscan/ipscan.jar
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
name : ipscan
-version : 3.7.0
-release : 6
+version : 3.7.2
+release : 7
source :
- - https://github.com/angryziber/ipscan/archive/3.7.0.tar.gz : abde3211db69ea714651cf808a208923712c99ddc78dbe930bb10ea29d998032
+ - https://github.com/angryziber/ipscan/archive/3.7.2.tar.gz : 550799948435877ff279a18b6e15dba4f6f69185eff6ce80798faf0a520ffa90
license : GPL-2.0-or-later
homepage : https://angryip.org/
component : network.util
@@ -13,15 +13,16 @@
builddeps :
- gradle
rundeps :
- - openjdk-8
-environment: |
- export GRADLE_USER_HOME=$workdir/.gradle
+ - openjdk-11
setup : |
- # patch build.gradle file so we skip building .deb and .rpm packages, we only need .jar
- # also skip minimizing jar because it is failing for some reason
- %patch -p1 < $pkgfiles/0001-disable-deb-rpm-minimize.patch
+ # This patch does the following:
+ # - Uses a Gradle property for version detection instead of Git
+ # - Disables building of deb and rpm packages
+ # - Disables minimization to avoid build failure
+ %patch -p1 < $pkgfiles/fix-build-gradle.patch
build : |
- gradle linux64
+ export GRADLE_USER_HOME=$workdir/.gradle
+ gradle --no-daemon -PipscanVersion=%version% linux64
install : |
install -Dm00755 $pkgfiles/ipscan -t $installdir/usr/bin
install -Dm00644 $pkgfiles/ipscan.desktop -t $installdir/usr/share/applications
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -3,8 +3,8 @@
<Name>ipscan</Name>
<Homepage>https://angryip.org/</Homepage>
<Packager>
- <Name>Fabio Forni</Name>
- <Email>livingsilver94.solus@redaril.me</Email>
+ <Name>Campbell Jones</Name>
+ <Email>dev@serebit.com</Email>
</Packager>
<License>GPL-2.0-or-later</License>
<PartOf>network.util</PartOf>
@@ -27,12 +27,12 @@
</Files>
</Package>
<History>
- <Update release="6">
- <Date>2020-04-13</Date>
- <Version>3.7.0</Version>
+ <Update release="7">
+ <Date>2020-06-06</Date>
+ <Version>3.7.2</Version>
<Comment>Packaging update</Comment>
- <Name>Fabio Forni</Name>
- <Email>livingsilver94.solus@redaril.me</Email>
+ <Name>Campbell Jones</Name>
+ <Email>dev@serebit.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 11, 3:54 PM (3 h, 5 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5808594
Default Alt Text
D9011.id21685.diff (6 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.