diff --git a/.etckeeper b/.etckeeper
index 6de0b41..7058a75 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -1014,23 +1014,23 @@ maybe chmod 0644 'issue.rpmnew'
maybe chmod 0644 'issue.rpmsave'
maybe chmod 0755 'java'
maybe chmod 0755 'java/java-1.8.0-openjdk'
-maybe chmod 0755 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64'
-maybe chmod 0755 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib'
-maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/calendars.properties'
-maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/logging.properties'
-maybe chmod 0755 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security'
-maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/blacklisted.certs'
-maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/java.policy'
-maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/java.security'
-maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/nss.cfg'
-maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/nss.fips.cfg'
-maybe chmod 0755 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/policy'
-maybe chmod 0755 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/policy/limited'
-maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/policy/limited/US_export_policy.jar'
-maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/policy/limited/local_policy.jar'
-maybe chmod 0755 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/policy/unlimited'
-maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/policy/unlimited/US_export_policy.jar'
-maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/policy/unlimited/local_policy.jar'
+maybe chmod 0755 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64'
+maybe chmod 0755 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib'
+maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/calendars.properties'
+maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/logging.properties'
+maybe chmod 0755 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security'
+maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/blacklisted.certs'
+maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/java.policy'
+maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/java.security'
+maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/nss.cfg'
+maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/nss.fips.cfg'
+maybe chmod 0755 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/policy'
+maybe chmod 0755 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/policy/limited'
+maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/policy/limited/US_export_policy.jar'
+maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/policy/limited/local_policy.jar'
+maybe chmod 0755 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/policy/unlimited'
+maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/policy/unlimited/US_export_policy.jar'
+maybe chmod 0644 'java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/policy/unlimited/local_policy.jar'
maybe chmod 0755 'java/security'
maybe chmod 0755 'java/security/security.d'
maybe chmod 0755 'jvm'
diff --git a/ImageMagick-6/mime.xml b/ImageMagick-6/mime.xml
index 3b768df..61f7228 100644
--- a/ImageMagick-6/mime.xml
+++ b/ImageMagick-6/mime.xml
@@ -1143,4 +1143,7 @@
+
+
+
diff --git a/alternatives/alt-java b/alternatives/alt-java
index 60c6b66..d2daa20 120000
--- a/alternatives/alt-java
+++ b/alternatives/alt-java
@@ -1 +1 @@
-/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/jre/bin/alt-java
\ No newline at end of file
+/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/jre/bin/alt-java
\ No newline at end of file
diff --git a/alternatives/alt-java.1.gz b/alternatives/alt-java.1.gz
index 15104c0..907b55c 120000
--- a/alternatives/alt-java.1.gz
+++ b/alternatives/alt-java.1.gz
@@ -1 +1 @@
-/usr/share/man/man1/alt-java-java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64.1.gz
\ No newline at end of file
+/usr/share/man/man1/alt-java-java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64.1.gz
\ No newline at end of file
diff --git a/alternatives/java b/alternatives/java
index c751637..607f6c2 120000
--- a/alternatives/java
+++ b/alternatives/java
@@ -1 +1 @@
-/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/jre/bin/java
\ No newline at end of file
+/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/jre/bin/java
\ No newline at end of file
diff --git a/alternatives/java.1.gz b/alternatives/java.1.gz
index 882ba09..a5c0bdf 120000
--- a/alternatives/java.1.gz
+++ b/alternatives/java.1.gz
@@ -1 +1 @@
-/usr/share/man/man1/java-java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64.1.gz
\ No newline at end of file
+/usr/share/man/man1/java-java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64.1.gz
\ No newline at end of file
diff --git a/alternatives/jjs b/alternatives/jjs
index b8077a5..c51d6a9 120000
--- a/alternatives/jjs
+++ b/alternatives/jjs
@@ -1 +1 @@
-/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/jre/bin/jjs
\ No newline at end of file
+/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/jre/bin/jjs
\ No newline at end of file
diff --git a/alternatives/jjs.1.gz b/alternatives/jjs.1.gz
index 1c32054..3a98684 120000
--- a/alternatives/jjs.1.gz
+++ b/alternatives/jjs.1.gz
@@ -1 +1 @@
-/usr/share/man/man1/jjs-java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64.1.gz
\ No newline at end of file
+/usr/share/man/man1/jjs-java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64.1.gz
\ No newline at end of file
diff --git a/alternatives/jre b/alternatives/jre
index ed689c4..7a9deaf 120000
--- a/alternatives/jre
+++ b/alternatives/jre
@@ -1 +1 @@
-/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/jre
\ No newline at end of file
+/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/jre
\ No newline at end of file
diff --git a/alternatives/jre_1.8.0 b/alternatives/jre_1.8.0
index ed689c4..7a9deaf 120000
--- a/alternatives/jre_1.8.0
+++ b/alternatives/jre_1.8.0
@@ -1 +1 @@
-/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/jre
\ No newline at end of file
+/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/jre
\ No newline at end of file
diff --git a/alternatives/jre_1.8.0_openjdk b/alternatives/jre_1.8.0_openjdk
index 1acd3a8..bb0819e 120000
--- a/alternatives/jre_1.8.0_openjdk
+++ b/alternatives/jre_1.8.0_openjdk
@@ -1 +1 @@
-/usr/lib/jvm/jre-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64
\ No newline at end of file
+/usr/lib/jvm/jre-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64
\ No newline at end of file
diff --git a/alternatives/jre_openjdk b/alternatives/jre_openjdk
index ed689c4..7a9deaf 120000
--- a/alternatives/jre_openjdk
+++ b/alternatives/jre_openjdk
@@ -1 +1 @@
-/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/jre
\ No newline at end of file
+/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/jre
\ No newline at end of file
diff --git a/alternatives/keytool b/alternatives/keytool
index ab65a9b..fb166d0 120000
--- a/alternatives/keytool
+++ b/alternatives/keytool
@@ -1 +1 @@
-/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/jre/bin/keytool
\ No newline at end of file
+/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/jre/bin/keytool
\ No newline at end of file
diff --git a/alternatives/keytool.1.gz b/alternatives/keytool.1.gz
index 141a73e..d9ba1d0 120000
--- a/alternatives/keytool.1.gz
+++ b/alternatives/keytool.1.gz
@@ -1 +1 @@
-/usr/share/man/man1/keytool-java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64.1.gz
\ No newline at end of file
+/usr/share/man/man1/keytool-java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64.1.gz
\ No newline at end of file
diff --git a/alternatives/orbd b/alternatives/orbd
index af9c2b8..0d8dd4f 120000
--- a/alternatives/orbd
+++ b/alternatives/orbd
@@ -1 +1 @@
-/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/jre/bin/orbd
\ No newline at end of file
+/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/jre/bin/orbd
\ No newline at end of file
diff --git a/alternatives/orbd.1.gz b/alternatives/orbd.1.gz
index 92d410d..de2dd59 120000
--- a/alternatives/orbd.1.gz
+++ b/alternatives/orbd.1.gz
@@ -1 +1 @@
-/usr/share/man/man1/orbd-java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64.1.gz
\ No newline at end of file
+/usr/share/man/man1/orbd-java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64.1.gz
\ No newline at end of file
diff --git a/alternatives/pack200 b/alternatives/pack200
index 617b6bf..384193c 120000
--- a/alternatives/pack200
+++ b/alternatives/pack200
@@ -1 +1 @@
-/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/jre/bin/pack200
\ No newline at end of file
+/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/jre/bin/pack200
\ No newline at end of file
diff --git a/alternatives/pack200.1.gz b/alternatives/pack200.1.gz
index 3875179..0c47f07 120000
--- a/alternatives/pack200.1.gz
+++ b/alternatives/pack200.1.gz
@@ -1 +1 @@
-/usr/share/man/man1/pack200-java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64.1.gz
\ No newline at end of file
+/usr/share/man/man1/pack200-java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64.1.gz
\ No newline at end of file
diff --git a/alternatives/policytool b/alternatives/policytool
index e964d13..1d02b17 120000
--- a/alternatives/policytool
+++ b/alternatives/policytool
@@ -1 +1 @@
-/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/jre/bin/policytool
\ No newline at end of file
+/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/jre/bin/policytool
\ No newline at end of file
diff --git a/alternatives/policytool.1.gz b/alternatives/policytool.1.gz
index 9157d56..d4d7513 120000
--- a/alternatives/policytool.1.gz
+++ b/alternatives/policytool.1.gz
@@ -1 +1 @@
-/usr/share/man/man1/policytool-java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64.1.gz
\ No newline at end of file
+/usr/share/man/man1/policytool-java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64.1.gz
\ No newline at end of file
diff --git a/alternatives/rmid b/alternatives/rmid
index 249c9ce..6c18dae 120000
--- a/alternatives/rmid
+++ b/alternatives/rmid
@@ -1 +1 @@
-/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/jre/bin/rmid
\ No newline at end of file
+/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/jre/bin/rmid
\ No newline at end of file
diff --git a/alternatives/rmid.1.gz b/alternatives/rmid.1.gz
index 5902c0e..7aaa83d 120000
--- a/alternatives/rmid.1.gz
+++ b/alternatives/rmid.1.gz
@@ -1 +1 @@
-/usr/share/man/man1/rmid-java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64.1.gz
\ No newline at end of file
+/usr/share/man/man1/rmid-java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64.1.gz
\ No newline at end of file
diff --git a/alternatives/rmiregistry b/alternatives/rmiregistry
index 20edb89..46a19da 120000
--- a/alternatives/rmiregistry
+++ b/alternatives/rmiregistry
@@ -1 +1 @@
-/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/jre/bin/rmiregistry
\ No newline at end of file
+/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/jre/bin/rmiregistry
\ No newline at end of file
diff --git a/alternatives/rmiregistry.1.gz b/alternatives/rmiregistry.1.gz
index 08e8bc9..9663e5f 120000
--- a/alternatives/rmiregistry.1.gz
+++ b/alternatives/rmiregistry.1.gz
@@ -1 +1 @@
-/usr/share/man/man1/rmiregistry-java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64.1.gz
\ No newline at end of file
+/usr/share/man/man1/rmiregistry-java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64.1.gz
\ No newline at end of file
diff --git a/alternatives/servertool b/alternatives/servertool
index 7b18129..ec930a0 120000
--- a/alternatives/servertool
+++ b/alternatives/servertool
@@ -1 +1 @@
-/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/jre/bin/servertool
\ No newline at end of file
+/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/jre/bin/servertool
\ No newline at end of file
diff --git a/alternatives/servertool.1.gz b/alternatives/servertool.1.gz
index 672fe65..30befc3 120000
--- a/alternatives/servertool.1.gz
+++ b/alternatives/servertool.1.gz
@@ -1 +1 @@
-/usr/share/man/man1/servertool-java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64.1.gz
\ No newline at end of file
+/usr/share/man/man1/servertool-java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64.1.gz
\ No newline at end of file
diff --git a/alternatives/tnameserv b/alternatives/tnameserv
index 94977bf..d8a3a78 120000
--- a/alternatives/tnameserv
+++ b/alternatives/tnameserv
@@ -1 +1 @@
-/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/jre/bin/tnameserv
\ No newline at end of file
+/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/jre/bin/tnameserv
\ No newline at end of file
diff --git a/alternatives/tnameserv.1.gz b/alternatives/tnameserv.1.gz
index 139eebd..888d466 120000
--- a/alternatives/tnameserv.1.gz
+++ b/alternatives/tnameserv.1.gz
@@ -1 +1 @@
-/usr/share/man/man1/tnameserv-java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64.1.gz
\ No newline at end of file
+/usr/share/man/man1/tnameserv-java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64.1.gz
\ No newline at end of file
diff --git a/alternatives/unpack200 b/alternatives/unpack200
index cd66c2e..b469472 120000
--- a/alternatives/unpack200
+++ b/alternatives/unpack200
@@ -1 +1 @@
-/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/jre/bin/unpack200
\ No newline at end of file
+/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/jre/bin/unpack200
\ No newline at end of file
diff --git a/alternatives/unpack200.1.gz b/alternatives/unpack200.1.gz
index 238db26..28b2f54 120000
--- a/alternatives/unpack200.1.gz
+++ b/alternatives/unpack200.1.gz
@@ -1 +1 @@
-/usr/share/man/man1/unpack200-java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64.1.gz
\ No newline at end of file
+/usr/share/man/man1/unpack200-java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64.1.gz
\ No newline at end of file
diff --git a/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/calendars.properties b/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/calendars.properties
similarity index 100%
rename from java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/calendars.properties
rename to java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/calendars.properties
diff --git a/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/logging.properties b/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/logging.properties
similarity index 100%
rename from java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/logging.properties
rename to java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/logging.properties
diff --git a/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/blacklisted.certs b/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/blacklisted.certs
similarity index 100%
rename from java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/blacklisted.certs
rename to java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/blacklisted.certs
diff --git a/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/cacerts b/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/cacerts
similarity index 100%
rename from java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/cacerts
rename to java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/cacerts
diff --git a/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/java.policy b/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/java.policy
similarity index 100%
rename from java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/java.policy
rename to java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/java.policy
diff --git a/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/java.security b/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/java.security
similarity index 99%
rename from java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/java.security
rename to java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/java.security
index ed55841..92b75cf 100644
--- a/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/java.security
+++ b/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/java.security
@@ -312,6 +312,13 @@ security.overridePropertiesFile=true
#
security.useSystemPropertiesFile=true
+#
+# Specifies the system certificate store
+# This property may be disabled using
+# -Djava.security.disableSystemCACerts=true
+#
+security.systemCACerts=/etc/pki/java/cacerts
+
#
# Determines the default key and trust manager factory algorithms for
# the javax.net.ssl package.
diff --git a/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/nss.cfg b/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/nss.cfg
similarity index 100%
rename from java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/nss.cfg
rename to java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/nss.cfg
diff --git a/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/nss.fips.cfg b/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/nss.fips.cfg
similarity index 100%
rename from java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/nss.fips.cfg
rename to java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/nss.fips.cfg
diff --git a/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/policy/limited/US_export_policy.jar b/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/policy/limited/US_export_policy.jar
similarity index 100%
rename from java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/policy/limited/US_export_policy.jar
rename to java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/policy/limited/US_export_policy.jar
diff --git a/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/policy/limited/local_policy.jar b/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/policy/limited/local_policy.jar
similarity index 100%
rename from java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/policy/limited/local_policy.jar
rename to java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/policy/limited/local_policy.jar
diff --git a/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/policy/unlimited/US_export_policy.jar b/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/policy/unlimited/US_export_policy.jar
similarity index 100%
rename from java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/policy/unlimited/US_export_policy.jar
rename to java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/policy/unlimited/US_export_policy.jar
diff --git a/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/policy/unlimited/local_policy.jar b/java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/policy/unlimited/local_policy.jar
similarity index 100%
rename from java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_6.x86_64/lib/security/policy/unlimited/local_policy.jar
rename to java/java-1.8.0-openjdk/java-1.8.0-openjdk-1.8.0.352.b08-2.el8_7.x86_64/lib/security/policy/unlimited/local_policy.jar
diff --git a/rpm/macros.zzz-epel-override b/rpm/macros.zzz-epel-override
index d26c90e..bf79bff 100644
--- a/rpm/macros.zzz-epel-override
+++ b/rpm/macros.zzz-epel-override
@@ -9,7 +9,23 @@
# and the default is /usr/libexec/platform-python.
# Usually, we don't want EPEL packages to use platform-python.
# Packages that want to do that can explicitly override this.
-%__python3 /usr/bin/python%{_python3_pkgversion_with_dot}
+#
+# When %%python3_pkgveresion is set to 3 (i.e. the default), we override
+# %%__python3 to /usr/bin/python3.6 to ensure that programs are always run with
+# python3.6, even if /usr/bin/python3 is a symlink to a different interpreter.
+#
+# See https://lists.fedoraproject.org/archives/list/epel-devel@lists.fedoraproject.org/thread/RE3PG72B5AX7NTACPDSBGOWCMN7I3OQJ/
+
+%__python3 %{lua:
+local bin = "/usr/bin/python"
+if rpm.expand("%python3_pkgversion") == "3" then
+ bin = bin .. "3.6"
+else
+ bin = bin .. rpm.expand("%{_python3_pkgversion_with_dot}")
+end
+print(bin)
+}
+
# RHEL 8's %%pytest does not work properly on non-default Python versions.
# Backported from https://src.fedoraproject.org/rpms/python-rpm-macros/c/02536540768555dde6d675935db45df81bcab7bf?branch=rawhide