From 6a95350ae1609d4f14e87807f2c07855290970ed Mon Sep 17 00:00:00 2001
From: Elio Maldonado <elio.maldonado.batiz@gmail.com>
Date: Tue, 20 Nov 2018 10:43:59 -0800
Subject: [PATCH] # This is a combination of 4 commits. # This is the 1st
 commit message:

Allow using jdk11 devel on openSUSE Leap 15.1

- Not intended for pull request

# This is the commit message #2:

Manually merge from master branch

# This is the commit message #3:

Continue the manual merge from master

# This is the commit message #4:

Continue the merge from upstream, delete obsoleted files
---
 cmake/JSSConfig.cmake                 |  2 ++
 tools/Dockerfiles/opensuse_leap_jdk11 | 10 ++++++----
 tools/Dockerfiles/opensuse_tumbleweed | 27 +++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 tools/Dockerfiles/opensuse_tumbleweed

diff --git a/cmake/JSSConfig.cmake b/cmake/JSSConfig.cmake
index 17f91cdc6..4374fdc35 100644
--- a/cmake/JSSConfig.cmake
+++ b/cmake/JSSConfig.cmake
@@ -19,6 +19,8 @@ macro(jss_config_version MAJOR MINOR PATCH BETA)
     # This sets the JSS Version for use in CMake and propagates it to the
     # necessary source locations. These are:
     #
+    #   org/mozilla/jss/CryptoManager.java{.in,}
+    #   org/mozilla/jss/JSSProvider.java{.in,}
     #   org/mozilla/jss/util/jssver.h{.in,}
     #   lib/MANIFEST.MF.in -> build/MANIFEST.MF
     #
diff --git a/tools/Dockerfiles/opensuse_leap_jdk11 b/tools/Dockerfiles/opensuse_leap_jdk11
index 1be03a466..94a4b8adb 100644
--- a/tools/Dockerfiles/opensuse_leap_jdk11
+++ b/tools/Dockerfiles/opensuse_leap_jdk11
@@ -20,8 +20,10 @@ COPY . /home/sandbox/jss
 # Perform the actual build
 WORKDIR /home/sandbox/jss
 CMD true \
-        && rm -rf /usr/bin/gcc \
-        && ln -s /usr/bin/gcc-8 /usr/bin/gcc \
-        && . tools/autoenv.sh \
-        && make clean all check \
+        && export JAVA_HOME=/usr/lib/jvm/jre-11-openjdk \
+        && rm -rf build \
+        && mkdir build \
+        && cd build \
+        && cmake .. \
+        && make all test \
         && true
diff --git a/tools/Dockerfiles/opensuse_tumbleweed b/tools/Dockerfiles/opensuse_tumbleweed
new file mode 100644
index 000000000..7b385579f
--- /dev/null
+++ b/tools/Dockerfiles/opensuse_tumbleweed
@@ -0,0 +1,27 @@
+FROM opensuse:tumbleweed
+
+# Install generic dependencies to build jss
+RUN true \
+        && zypper refresh \
+        && zypper update -y \
+        && zypper install -y gcc make java-11-openjdk-devel mozilla-nss-tools mozilla-nss-devel mozilla-nspr-devel slf4j apache-commons-codec apache-commons-lang gcc-c++ ws-jaxme which \
+        && mkdir -p /home/sandbox \
+        && zypper clean --all \
+        && rm -rf /usr/share/doc /usr/share/doc-base \
+                  /usr/share/man /usr/share/locale /usr/share/zoneinfo \
+        && true
+
+# Link in the current version of jss from the git repository
+WORKDIR /home/sandbox
+COPY . /home/sandbox/jss
+
+# Perform the actual build
+WORKDIR /home/sandbox/jss
+CMD true \
+        && export JAVA_HOME=/usr/lib/jvm/jre-11-openjdk \
+        && rm -rf build \
+        && mkdir build \
+        && cd build \
+        && cmake .. \
+        && make all test \
+        && true