From a16df7f68a8547f29e5762c28c504a47d06c9c0f Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Jul 31 2020 17:10:14 +0000
Subject: Update to latest upstream release

Add patch to fix incorrect java version detection of java 9+

---

diff --git a/.gitignore b/.gitignore
index b3c21bc..44a52bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ wmeissner-jffi-bbb81f1.tar.gz
 /1.2.10.zip
 /1.2.11.zip
 /jffi-1.2.12.tar.gz
+/jffi-1.2.23.tar.gz
diff --git a/0001-Fix-dependencies-on-junit-hamcrest.patch b/0001-Fix-dependencies-on-junit-hamcrest.patch
new file mode 100644
index 0000000..d90455b
--- /dev/null
+++ b/0001-Fix-dependencies-on-junit-hamcrest.patch
@@ -0,0 +1,60 @@
+From df823903e6ab15e9b336b5e5828afaaa87b66086 Mon Sep 17 00:00:00 2001
+From: Mat Booth <mat.booth@redhat.com>
+Date: Fri, 31 Jul 2020 13:30:15 +0100
+Subject: [PATCH 1/4] Fix dependencies on junit/hamcrest
+
+---
+ build.xml | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index cff1184..4474244 100644
+--- a/build.xml
++++ b/build.xml
+@@ -2,8 +2,8 @@
+ <project name="jffi" default="jar" basedir=".">
+   <description>Builds, tests, and runs the project jffi.</description>
+   <path id="classpath.test">
+-    <pathelement location="lib/junit_4/junit-4.11.jar"/>
+-    <pathelement location="lib/junit_4/hamcrest-core-1.3.jar"/>
++    <pathelement location="lib/junit.jar"/>
++    <pathelement location="lib/hamcrest_core.jar"/>
+   </path>
+ 
+   <target name="clean-java" depends="-init">
+@@ -181,8 +181,8 @@
+       <classpath>
+         <pathelement location="${build.classes.dir}"/>
+         <pathelement location="${build.test.dir}/classes"/>
+-        <pathelement location="lib/junit_4/junit-4.11.jar"/>
+-        <pathelement location="lib/junit_4/hamcrest-core-1.3.jar"/>
++        <pathelement location="lib/junit.jar"/>
++        <pathelement location="lib/hamcrest_core.jar"/>
+       </classpath>
+       <sysproperty key="java.library.path" value="${build.native.dir}"/>
+ 
+@@ -207,8 +207,8 @@
+       <classpath>
+         <pathelement location="${build.classes.dir}"/>
+         <pathelement location="${build.test.dir}/classes"/>
+-        <pathelement location="lib/junit_4/junit-4.11.jar"/>
+-        <pathelement location="lib/junit_4/hamcrest-core-1.3.jar"/>
++        <pathelement location="lib/junit.jar"/>
++        <pathelement location="lib/hamcrest_core.jar"/>
+       </classpath>
+       <sysproperty key="java.library.path" value="${build.native.dir}"/>
+       <formatter type="plain" usefile="false"/>
+@@ -229,8 +229,8 @@
+     <javac srcdir="${src.test.dir}" destdir="${build.test.dir}/classes" includeantruntime="false" classpathref="classpath.test">
+       <classpath>
+         <pathelement location="${build.classes.dir}"/>
+-        <pathelement location="lib/junit_4/junit-4.11.jar"/>
+-        <pathelement location="lib/junit_4/hamcrest-core-1.3.jar"/>
++        <pathelement location="lib/junit.jar"/>
++        <pathelement location="lib/hamcrest_core.jar"/>
+       </classpath>
+     </javac>
+   </target>
+-- 
+2.26.2
+
diff --git a/0002-Fix-compilation-flags.patch b/0002-Fix-compilation-flags.patch
new file mode 100644
index 0000000..d777caa
--- /dev/null
+++ b/0002-Fix-compilation-flags.patch
@@ -0,0 +1,61 @@
+From ec546b03f871b9abaacdf359b1157f2eccfd4f8e Mon Sep 17 00:00:00 2001
+From: Mat Booth <mat.booth@redhat.com>
+Date: Fri, 31 Jul 2020 13:53:48 +0100
+Subject: [PATCH 2/4] Fix compilation flags
+
+---
+ jni/GNUmakefile | 10 ++++++----
+ pom.xml         |  4 ++++
+ 2 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/jni/GNUmakefile b/jni/GNUmakefile
+index b5165db..58e5854 100755
+--- a/jni/GNUmakefile
++++ b/jni/GNUmakefile
+@@ -67,10 +67,10 @@ OFLAGS = -O2 $(JFLAGS)
+ WERROR = -Werror
+ ifneq ($(OS),darwin)
+ ifneq ($(OS),aix)
+-  WFLAGS += -Wundef $(WERROR)
++  WFLAGS += -Wundef
+ endif
+ endif
+-WFLAGS += -W -Wall -Wno-unused -Wno-parentheses -Wno-unused-parameter
++WFLAGS += -W -Wall -Wno-parentheses -Wno-unused-parameter
+ PICFLAGS = -fPIC
+ SOFLAGS = # Filled in for each OS specifically
+ FFI_MMAP_EXEC = -DFFI_MMAP_EXEC_WRIT
+@@ -78,11 +78,13 @@ FFI_MMAP_EXEC = -DFFI_MMAP_EXEC_WRIT
+ FFI_CC = $(CCACHE) $(CC)
+ FFI_LD = $(LD)
+ FFI_CFLAGS = $(FFI_MMAP_EXEC) $(OFLAGS)
+-STRIP ?= strip -S
++STRIP ?= /bin/true
++
++RPMFLAGS=$(shell rpm --eval %optflags)
+ 
+ JDK_INCLUDES = -I"$(JDK_HOME)/include" -I"$(JDK_HOME)/include/$(OS)"
+ IFLAGS = -I"$(BUILD_DIR)" -I"$(BUILD_DIR)"/jni -I$(SRC_DIR) -I"$(JFFI_SRC_DIR)"
+-CFLAGS += $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) $(LIBFFI_CFLAGS)
++CFLAGS += $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) $(LIBFFI_CFLAGS) $(RPMFLAGS)
+ CFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
+ 
+ ifeq ($(OS), win64)
+diff --git a/pom.xml b/pom.xml
+index 66dc587..6320fad 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -210,6 +210,10 @@
+                             <include name="**/*.jar" />
+                           </fileset>
+                       </unzip>
++                      <exec executable="/bin/sh">
++                        <arg value="-c"/>
++                        <arg value="strip -s ${project.build.directory}/jni/*/*.so"/>
++                      </exec>
+                     </tasks>
+                 </configuration>
+             </execution>
+-- 
+2.26.2
+
diff --git a/0003-Fix-native-header-generation.patch b/0003-Fix-native-header-generation.patch
new file mode 100644
index 0000000..74ef849
--- /dev/null
+++ b/0003-Fix-native-header-generation.patch
@@ -0,0 +1,35 @@
+From e504b0a19157bb165ea20f0c9f3e08ae4e40531f Mon Sep 17 00:00:00 2001
+From: Mat Booth <mat.booth@redhat.com>
+Date: Fri, 31 Jul 2020 13:55:35 +0100
+Subject: [PATCH 3/4] Fix native header generation
+
+---
+ build.xml | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 4474244..11a818e 100644
+--- a/build.xml
++++ b/build.xml
+@@ -297,11 +297,13 @@
+   <target name="-generate-native-headers" depends="-init-vars,-generate-version,-compile-java">
+     <mkdir dir="${build.native.dir}"/>
+     <mkdir dir="${build.classes.dir}"/>
+-    <javah classpath="${build.classes.dir}" destdir="${build.native.dir}" force="yes">
+-      <class name="com.kenai.jffi.Foreign"/>
+-      <class name="com.kenai.jffi.ObjectBuffer"/>
+-      <class name="com.kenai.jffi.Version"/>
+-    </javah>
++    <javac destdir="${build.native.dir}" nativeheaderdir="${build.native.dir}">
++      <src path="${src.dir}"/>
++      <src path="${build.dir}/java"/>
++      <include name="com/kenai/jffi/Foreign.java"/>
++      <include name="com/kenai/jffi/ObjectBuffer.java"/>
++      <include name="com/kenai/jffi/Version.java"/>
++    </javac>
+     <!--
+     <exec executable="javah" failonerror="true">
+       <arg line="-d ${build.native.dir}"/>
+-- 
+2.26.2
+
diff --git a/0004-Fix-java-version-detection.patch b/0004-Fix-java-version-detection.patch
new file mode 100644
index 0000000..e131577
--- /dev/null
+++ b/0004-Fix-java-version-detection.patch
@@ -0,0 +1,29 @@
+From 5ea50b58d2dd86f4a795b78e1eec6faf8d29a891 Mon Sep 17 00:00:00 2001
+From: Mat Booth <mat.booth@redhat.com>
+Date: Fri, 31 Jul 2020 15:30:17 +0100
+Subject: [PATCH 4/4] Fix java version detection
+
+---
+ src/main/java/com/kenai/jffi/Platform.java | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/main/java/com/kenai/jffi/Platform.java b/src/main/java/com/kenai/jffi/Platform.java
+index 8464bdc..0a11fdb 100644
+--- a/src/main/java/com/kenai/jffi/Platform.java
++++ b/src/main/java/com/kenai/jffi/Platform.java
+@@ -262,7 +262,11 @@ public abstract class Platform {
+             String versionString = System.getProperty("java.version");
+             if (versionString != null) {
+                 String[] v = versionString.split("\\.");
+-                version = Integer.valueOf(v[1]);
++		if (Integer.valueOf(v[0]) > 1) {
++			version = Integer.valueOf(v[0]);
++		} else {
++	                version = Integer.valueOf(v[1]);
++		}
+             }
+         } catch (Exception ex) {
+             // Assume version 5 or above.
+-- 
+2.26.2
+
diff --git a/jffi-add-built-jar-to-test-classpath.patch b/jffi-add-built-jar-to-test-classpath.patch
deleted file mode 100644
index b8d394f..0000000
--- a/jffi-add-built-jar-to-test-classpath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- build.xml.sav	2015-04-30 18:23:37.609686947 +0300
-+++ build.xml	2015-04-30 18:23:50.621619907 +0300
-@@ -219,8 +219,8 @@
-     <javac srcdir="${src.test.dir}" destdir="${build.test.dir}/classes" includeantruntime="false" classpathref="classpath.test">
-       <classpath>
-         <pathelement location="${build.classes.dir}"/>
--        <pathelement location="lib/junit_4/junit-4.11.jar"/>
--        <pathelement location="lib/junit_4/hamcrest-core-1.3.jar"/>
-+        <pathelement location="lib/junit.jar"/>
-+      	<pathelement location="${complete.jar}"/>
-       </classpath>
-     </javac>
-   </target>
diff --git a/jffi-fix-compilation-flags.patch b/jffi-fix-compilation-flags.patch
deleted file mode 100644
index 5b1916c..0000000
--- a/jffi-fix-compilation-flags.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- jni/GNUmakefile.orig	2015-03-02 23:35:21.000000000 +0200
-+++ jni/GNUmakefile	2015-04-30 18:16:46.270806239 +0300
-@@ -66,9 +66,9 @@ OFLAGS = -O2 $(JFLAGS)
- # MacOS headers aren't completely warning free, so turn them off
- WERROR = -Werror
- ifneq ($(OS),darwin)
--  WFLAGS += -Wundef $(WERROR)
-+  WFLAGS += -Wundef
- endif
--WFLAGS += -W -Wall -Wno-unused -Wno-parentheses -Wno-unused-parameter
-+WFLAGS += -W -Wall -Wno-parentheses -Wno-unused-parameter
- PICFLAGS = -fPIC
- SOFLAGS = # Filled in for each OS specifically
- FFI_MMAP_EXEC = -DFFI_MMAP_EXEC_WRIT
-@@ -76,11 +76,13 @@ FFI_MMAP_EXEC = -DFFI_MMAP_EXEC_WRIT
- FFI_CC = $(CCACHE) $(CC)
- FFI_LD = $(LD)
- FFI_CFLAGS = $(FFI_MMAP_EXEC) $(OFLAGS)
--STRIP ?= strip -S
-+STRIP ?= /bin/true
-+
-+RPMFLAGS=$(shell rpm --eval %optflags)
- 
- JDK_INCLUDES = -I"$(JDK_HOME)/include" -I"$(JDK_HOME)/include/$(OS)"
- IFLAGS = -I"$(BUILD_DIR)" -I"$(BUILD_DIR)"/jni -I$(SRC_DIR) -I"$(JFFI_SRC_DIR)"
--CFLAGS += $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) $(LIBFFI_CFLAGS)
-+CFLAGS += $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) $(LIBFFI_CFLAGS) $(RPMFLAGS)
- CFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
- 
- ifeq ($(OS), win64)
---- pom.xml.orig	2017-07-18 13:13:49.051730126 +0100
-+++ pom.xml	2017-07-18 13:27:54.899479303 +0100
-@@ -201,6 +201,10 @@
-                             <include name="**/*.jar" />
-                           </fileset>
-                       </unzip>
-+                      <exec executable="/bin/sh">
-+                        <arg value="-c"/>
-+                        <arg value="strip -s ${project.build.directory}/jni/*/*.so"/>
-+                      </exec>
-                     </tasks>
-                 </configuration>
-             </execution>
diff --git a/jffi-fix-dependencies-in-build-xml.patch b/jffi-fix-dependencies-in-build-xml.patch
deleted file mode 100644
index 2c19791..0000000
--- a/jffi-fix-dependencies-in-build-xml.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- build.xml.orig	2015-04-30 18:11:44.075363204 +0300
-+++ build.xml	2015-04-30 18:12:37.964085560 +0300
-@@ -172,8 +172,8 @@
-       <classpath>
-         <pathelement location="${build.classes.dir}"/>
-         <pathelement location="${build.test.dir}/classes"/>
--        <pathelement location="lib/junit_4/junit-4.11.jar"/>
--        <pathelement location="lib/junit_4/hamcrest-core-1.3.jar"/>
-+        <pathelement location="lib/junit.jar"/>
-+        <pathelement location="lib/hamcrest_core.jar"/>
-       </classpath>
-       <sysproperty key="java.library.path" value="${build.native.dir}"/>
- 
diff --git a/jffi-fix-native-headers.patch b/jffi-fix-native-headers.patch
deleted file mode 100644
index 3f6ea4d..0000000
--- a/jffi-fix-native-headers.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 4d0a6d7..e41aa2f 100644
---- a/build.xml
-+++ b/build.xml
-@@ -288,11 +288,13 @@
-   <target name="-generate-native-headers" depends="-init-vars,-generate-version,-compile-java">
-     <mkdir dir="${build.native.dir}"/>
-     <mkdir dir="${build.classes.dir}"/>
--    <javah classpath="${build.classes.dir}" destdir="${build.native.dir}" force="yes">
--      <class name="com.kenai.jffi.Foreign"/>
--      <class name="com.kenai.jffi.ObjectBuffer"/>
--      <class name="com.kenai.jffi.Version"/>
--    </javah>
-+    <javac destdir="${build.native.dir}" nativeheaderdir="${build.native.dir}">
-+      <src path="${src.dir}"/>
-+      <src path="${build.dir}/java"/>
-+      <include name="com/kenai/jffi/Foreign.java"/>
-+      <include name="com/kenai/jffi/ObjectBuffer.java"/>
-+      <include name="com/kenai/jffi/Version.java"/>
-+    </javac>
-     <!--
-     <exec executable="javah" failonerror="true">
-       <arg line="-d ${build.native.dir}"/>
diff --git a/jffi.spec b/jffi.spec
index 8fdd04e..66bb6f1 100644
--- a/jffi.spec
+++ b/jffi.spec
@@ -2,18 +2,26 @@
 %global sover 1.2
 
 Name:           jffi
-Version:        1.2.12
-Release:        16%{?dist}
+Version:        1.2.23
+Release:        1%{?dist}
 Summary:        Java Foreign Function Interface
 
 License:        LGPLv3+ or ASL 2.0
 URL:            http://github.com/jnr/jffi
 Source0:        https://github.com/%{cluster}/%{name}/archive/%{name}-%{version}.tar.gz
 Source3:        p2.inf
-Patch0:         jffi-fix-dependencies-in-build-xml.patch
-Patch1:         jffi-add-built-jar-to-test-classpath.patch
-Patch2:         jffi-fix-compilation-flags.patch
-Patch3:         jffi-fix-native-headers.patch
+
+# Fix references to junit/hamcrest to match what is generated by `build-jar-repository`
+Patch0:         0001-Fix-dependencies-on-junit-hamcrest.patch
+
+# Fix compilation flags and binary stripping
+Patch1:         0002-Fix-compilation-flags.patch
+
+# Allow building on Java 11
+Patch2:         0003-Fix-native-header-generation.patch
+
+# Fix java version detection of Java 9+
+Patch3:         0004-Fix-java-version-detection.patch
 
 BuildRequires:  gcc
 BuildRequires:  make
@@ -22,7 +30,6 @@ BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-assembly-plugin)
-BuildRequires:  mvn(org.sonatype.oss:oss-parent:pom:)
 BuildRequires:  libffi-devel
 BuildRequires:  ant
 BuildRequires:  ant-junit
@@ -46,11 +53,15 @@ This package contains the API documentation for %{name}.
 
 %prep
 %setup -q -n %{name}-%{name}-%{version}
-%patch0
-%patch1
-%patch2
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 %patch3 -p1
 
+# Remove pointless parent pom
+%pom_remove_parent
+
+# Allow building on Java 11
 for f in src/main/java/com/kenai/jffi/{Foreign,ObjectBuffer}.java version.xml; do
   # Add the import for @Native
   sed -i '/package .*;/ a import java.lang.annotation.Native;' $f
@@ -58,18 +69,22 @@ for f in src/main/java/com/kenai/jffi/{Foreign,ObjectBuffer}.java version.xml; d
   sed -i '/\(static final\|final static\) int [A-Z]/ i @Native' $f
 done
 
-# ppc{,64} fix
-# https://bugzilla.redhat.com/show_bug.cgi?id=561448#c9
-sed -i.cpu -e '/m\$(MODEL)/d' jni/GNUmakefile libtest/GNUmakefile
-
 # remove uneccessary directories
-rm -rf archive/* jni/libffi/ jni/win32/ lib/CopyLibs/ lib/junit*
+rm -r archive/* jni/libffi/ lib/junit*
 
+# Remove any pre-build bytecode
 find ./ -name '*.jar' -exec rm -f '{}' \; 
 find ./ -name '*.class' -exec rm -f '{}' \; 
 
+# Test dependencies for ant tests
 build-jar-repository -s -p lib/ junit hamcrest/core
 
+# A couple of tests fail on armv7 for some reason
+sed -i -e 's/haltonfailure="true"/haltonfailure="no"/' build.xml
+
+# Ensure debug symbols in the native java
+sed -i -e 's/<javac/<javac debug="true"/' build.xml
+
 %mvn_package 'com.github.jnr:jffi::native:' native
 %mvn_file ':{*}' %{name}/@1 @1
 
@@ -102,19 +117,23 @@ popd
 %check
 # don't fail on unused parameters... (TODO: send patch upstream)
 sed -i 's|-Werror||' libtest/GNUmakefile
-ant -Duse.system.libffi=1 test
+ant -Duse.system.libffi=1 -Drun.jvm.model=-Xmx128m test
 
 %files -f .mfiles
-%doc COPYING.GPL COPYING.LESSER LICENSE
+%license COPYING.GPL COPYING.LESSER LICENSE
 
 %files native -f .mfiles-native
 %{_libdir}/%{name}
-%doc COPYING.GPL COPYING.LESSER LICENSE
+%license COPYING.GPL COPYING.LESSER LICENSE
 
 %files javadoc -f .mfiles-javadoc
-%doc COPYING.GPL COPYING.LESSER LICENSE
+%license COPYING.GPL COPYING.LESSER LICENSE
 
 %changelog
+* Fri Jul 31 2020 Mat Booth <mat.booth@redhat.com> - 1.2.23-1
+- Update to latest upstream release
+- Add patch to fix incorrect java version detection of java 9+
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.12-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index 1a218bb..9af49cd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a8837f4ea23e34db8716236d26bcd6cc  jffi-1.2.12.tar.gz
+SHA512 (jffi-1.2.23.tar.gz) = 991ccfb13487812187110a544737f6c78d8915f81a32cc6b53ad3417d7eb7ff3796849db66d29e4081ef10017b9d809b2b2918d942912cd3f9ed68e3b32ad498