summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDrew Noel2020-07-27 13:31:14 -0400
committerDrew Noel2020-07-27 13:31:14 -0400
commit2da67fe12694514b5ad11f07b20a844473ca198a (patch)
tree3d166d53019e9d6c463c8ddc592254863cd042ac
parentb9f9e1e6ac4c5c028fe56513b4138e881d3be7c5 (diff)
downloadaur-2da67fe12694514b5ad11f07b20a844473ca198a.tar.gz
Bump to fix ambiguous JDK requirement
-rw-r--r--.SRCINFO6
-rw-r--r--0001-Force-1.8.patch18
-rw-r--r--PKGBUILD12
3 files changed, 31 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8e4a547b2f69..789475249e03 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,18 @@
pkgbase = ysoserial-git
pkgdesc = Tool to generate payloads that exploit unsafe Java object deserialization
- pkgver = 0.0.5.r45.gff59523
+ pkgver = 0.0.5.r61.g3009984
pkgrel = 1
url = https://github.com/frohoff/ysoserial
arch = any
license = MIT
makedepends = maven
- depends = java-environment
+ depends = java-environment=8
provides = ysoserial
source = git://github.com/frohoff/ysoserial.git
+ source = 0001-Force-1.8.patch
source = ysoserial.command
md5sums = SKIP
+ md5sums = af0fe7db4bd0c93d89f03fc8188930bd
md5sums = d9fb33a927b0ee7864b80257ab6a2269
pkgname = ysoserial-git
diff --git a/0001-Force-1.8.patch b/0001-Force-1.8.patch
new file mode 100644
index 000000000000..2273e829da5d
--- /dev/null
+++ b/0001-Force-1.8.patch
@@ -0,0 +1,18 @@
+diff --git a/pom.xml b/pom.xml
+index 73d39c4..f6f68d1 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -22,8 +22,8 @@
+ <version>3.5.1</version>
+ <configuration>
+ <!-- maximize compatibility -->
+- <source>1.6</source>
+- <target>1.6</target>
++ <source>1.8</source>
++ <target>1.8</target>
+ <!-- ignore noisy internal api warnings -->
+ <compilerArgument>-XDignore.symbol.file</compilerArgument>
+ <fork>true</fork>
+--
+2.27.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 5f0a9869d778..da8e854d62a9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,17 @@
# Maintainer: Drew Noel <dnoel@gdssecurity.com>
pkgname=ysoserial-git
pkgrel=1
-pkgver=0.0.5.r45.gff59523
+pkgver=0.0.5.r61.g3009984
pkgdesc="Tool to generate payloads that exploit unsafe Java object deserialization"
arch=("any")
url="https://github.com/frohoff/ysoserial"
license=('MIT')
-depends=("java-environment")
+depends=("java-environment=8")
makedepends=("maven")
provides=("ysoserial")
-source=("git://github.com/frohoff/ysoserial.git" "ysoserial.command")
+source=("git://github.com/frohoff/ysoserial.git" "0001-Force-1.8.patch" "ysoserial.command")
md5sums=('SKIP'
+ 'af0fe7db4bd0c93d89f03fc8188930bd'
'd9fb33a927b0ee7864b80257ab6a2269')
pkgver() {
@@ -18,6 +19,11 @@ pkgver() {
git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}
+prepare() {
+ cd "ysoserial"
+ patch --forward --strip=1 --input="${srcdir}/0001-Force-1.8.patch"
+}
+
build() {
cd "ysoserial"
mvn clean package -DskipTests -DoutputDirectory="ysoserial/maven"