♻️ updated to Java 8 Update 371

diff --git a/.gitignore b/.gitignore
index 7ea1f2264872f40f4ed7ec04addf16cb601e1454..79f66f13e8012d07958bdc14c5f42da64cd6789a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 oss-pkg-JavaRuntime.spec
+.DS_Store
+repo-ng/HASH.json

diff --git a/FULLNAMES b/FULLNAMES
index a65302374599386c3999b0b49c4e3ea6875ae352..7ae440fed31eeba7538f224b5266fb59e1d33907 100644 (file)
--- a/FULLNAMES
+++ b/FULLNAMES
@@ -1,6 +1,2 @@
-Java(TM) 6 Update 45 (64-bit)
-Java(TM) 6 Update 45
-Java 7 Update 80 (64-bit)
-Java 7 Update 80
-Java 8 Update 131 (64-bit)
-Java 8 Update 131
+Java 8 Update 371 (64-bit)
+Java 8 Update 371

diff --git a/JavaRuntime.sls b/JavaRuntime.sls
index b83775e8447b3d33dd3636c9b418676d20d9aeee..5ade84eb8334c22d2c0c78921a7f7370def4bcdc 100644 (file)
--- a/JavaRuntime.sls
+++ b/JavaRuntime.sls
@@ -1,11 +1,11 @@
 ###############################################################################
 # SLS: Java Runtime
-# Copyright (c) 2017 Helmuth Varkoly, Nuermberg, Germany.
+# Copyright (c) 2023 Helmuth Varkoly, Nuermberg, Germany.
 # All rights reserved.
 #
 # Authos:               Helmuth Varkoly
 #
-# Description:          SLS to use with OSS's softwaremanagement              
+# Description:          SLS to use with Cranix's softwaremanagement              
 ###############################################################################
 JavaRuntime:
   pkg:

diff --git a/LICENSE b/LICENSE
index c70fc0db0a1550ac33aa46a1388e2a32ad5bb17e..2423a30e2652783cde4cf462a7748f3ba99734f6 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1 +1 @@
-Copyright (c) 2017 Peter Varkoly and Helmuth Varkoly Nürnberg. All rights reserverd.
\ No newline at end of file
+Copyright (c) 2023 Peter Varkoly and Helmuth Varkoly Nürnberg. All rights reserverd.
\ No newline at end of file

diff --git a/Makefile b/Makefile
index 6d1c30d30c044dc2396fec5c025d0d91170532e6..9229013594a70164f8a488f61024d405f4fcb5d1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ REPO            = /srv/www/repo/TESTING/salt-packages/
 VERSION         = $(shell cat VERSION )
 RELEASE         = $(shell cat RELEASE )
 NRELEASE        = $(shell echo $(RELEASE) + 1 | bc )
-YEAR           = $(shell date +%Y )
+YEAR                   = $(shell date +%Y )
 
 package:
        sed    s/VERSION/$(VERSION)/g  oss-pkg-$(PACKAGE).spec.in > oss-pkg-$(PACKAGE).spec
@@ -19,7 +19,7 @@ package:
        rm -rf oss-pkg-$(PACKAGE)
        mv  oss-pkg-$(PACKAGE).tar.bz2  /usr/src/packages/SOURCES/
        rpmbuild -bb oss-pkg-$(PACKAGE).spec
-       for i in $(REPO)/noarch/oss-pkg-$(PACKAGE)-$(VERSION)-*.rpm; do test -e $$i && rm $$i; done 
+       find $(REPO)/noarch -name "oss-pkg-$(PACKAGE)-$(VERSION)-*.rpm"  -exec rm {} \; 
        mv /usr/src/packages/RPMS/noarch/oss-pkg-$(PACKAGE)-$(VERSION)-$(NRELEASE).noarch.rpm $(REPO)/noarch
        echo $(NRELEASE) > RELEASE
        git commit -a -m "New release"

diff --git a/VERSION b/VERSION
index 3140cad0319f2a7c12602cf8042804bd31b46e2f..2ad09214c7e808f50a6846a9b84dc63ef621c84d 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.0.450
+8.371.0

diff --git a/oss-pkg-JavaRuntime.spec.in b/oss-pkg-JavaRuntime.spec.in
index cd3e3f74e3b4a84dffd7a18de967e6f8c9d93930..453dc1844e1b796928b9ae060f0f441985653121 100644 (file)
--- a/oss-pkg-JavaRuntime.spec.in
+++ b/oss-pkg-JavaRuntime.spec.in
@@ -4,7 +4,7 @@
 #
 
 Name:         oss-pkg-PACKAGE
-Summary:      Package to install PACKAGE on OSS-Clients
+Summary:      Package to install PACKAGE on Cranix-Clients
 Version:      VERSION
 Release:      RELEASE
 License:      GPL-2.0
@@ -21,7 +21,7 @@ PreReq:       %fillup_prereq
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 
 %description
-Package to install PACKAGE on OSS-Clients
+Package to install PACKAGE on Cranix-Clients
 
 Authors:
 --------

diff --git a/repo-ng/init.sls b/repo-ng/init.sls
index a1f82a287a4c0e55dde8f14b4662d8325b26ad64..67d19b94b6262896568e49b532c026fb96d3af23 100755 (executable)
--- a/repo-ng/init.sls
+++ b/repo-ng/init.sls
@@ -1,9 +1,9 @@
 ###############################################################################
 # SLS: Java Runtime
-# Copyright (c) 2017 Helmuth Varkoly, Nuermberg, Germany.
+# Copyright (c) 2023 Helmuth Varkoly, Nuermberg, Germany.
 # All rights reserved.
 #
-# Authos:               Helmuth Varkoly
+# Authos:               Helmuth Varkoly, Maximilian Grunow
 #
 # Description:          SLS for installation
 ###############################################################################
@@ -16,57 +16,17 @@
 {% set LOG_PATH = 'C:\\salt\\var\\log' %}
 
 JavaRuntime:
-  '6.0.450':
+  '8.371.0':
     {% if ARCH == 'x64' %}
-    full_name: 'Java(TM) 6 Update 45 (64-bit)'
-    installer: salt://win/repo-ng/JavaRuntime/jre-6u45-windows-x64.exe
-    {% else%}
-    full_name: 'Java(TM) 6 Update 45'
-    installer: salt://win/repo-ng/JavaRuntime/jre-6u45-windows-i586.exe
-    {% endif %}
-    install_flags: '/s /L "{{ LOG_PATH }}JavaRuntime_inst.log"'
-    uninstaller: 'msiexec.exe'
-    {% if ARCH == 'x64' %}
-    uninstall_flags: '/x {26A24AE4-039D-4CA4-87B4-2F86416045FF} /quiet /log "{{ LOG_PATH }}JavaRuntime_uninst.log" /norestart'
-    {% else %}
-    uninstall_flags: '/x {26A24AE4-039D-4CA4-87B4-2F83216045FF} /quiet /log "{{ LOG_PATH }}JavaRuntime_uninst.log" /norestart'
-    {% endif %}
-    locale: de_DE
-    msiexec: False
-    reboot: False
-  '7.0.800':
-    {% if ARCH == 'x64' %}
-    full_name: 'Java 7 Update 80 (64-bit)'
-    installer: salt://win/repo-ng/JavaRuntime/jre-7u80-windows-x64.exe
-    {% else%}
-    full_name: 'Java 7 Update 80'
-    installer: salt://win/repo-ng/JavaRuntime/jre-7u80-windows-i586.exe
-    {% endif %}
-    install_flags: '/s /L "{{ LOG_PATH }}JavaRuntime_inst.log"'
-    uninstaller: 'msiexec.exe'
-    {% if ARCH == 'x64' %}
-    uninstall_flags: '/x {26A24AE4-039D-4CA4-87B4-2F06417080FF} /quiet /log "{{ LOG_PATH }}JavaRuntime_uninst.log" /norestart'
-    {% else %}          
-    uninstall_flags: '/x {26A24AE4-039D-4CA4-87B4-2F03217080FF} /quiet /log "{{ LOG_PATH }}JavaRuntime_uninst.log" /norestart'
-    {% endif %}
-    locale: de_DE
-    msiexec: False
-    reboot: False
-  '8.0.1310.11':
-    {% if ARCH == 'x64' %}
-    full_name: 'Java 8 Update 131 (64-bit)'
-    installer: salt://win/repo-ng/JavaRuntime/jre-8u131-windows-x64.exe
+    full_name: 'Java 8 Update 371 (64-bit)'
+    installer: salt://win/repo-ng/JavaRuntime/jre-8u371-windows-x64.exe
     {% else %}
-    full_name: 'Java 8 Update 131'
-    installer: salt://win/repo-ng/JavaRuntime/jre-8u131-windows-i586.exe
+    full_name: 'Java 8 Update 371'
+    installer: salt://win/repo-ng/JavaRuntime/jre-8u371-windows-i586.exe
     {% endif %}
     install_flags: '/s /L "{{ LOG_PATH }}\JavaRuntime_inst.log"'
     uninstaller: 'msiexec.exe'
-    {% if ARCH == 'x64' %}
     uninstall_flags: '/x {26A24AE4-039D-4CA4-87B4-2F64180131F0} /quiet /l* "{{ LOG_PATH }}\JavaRuntime_uninst.log" /norestart'
-    {% else %}
-    uninstall_flags: '/x {26A24AE4-039D-4CA4-87B4-2F32180131F0} /quiet /l* "{{ LOG_PATH }}\JavaRuntime_uninst.log" /norestart'
-    {% endif %}
     locale: de_DE        
     msiexec: False
     reboot: False

diff --git a/repo-ng/jre-8u131-windows-i586.exe b/repo-ng/jre-8u131-windows-i586.exe
deleted file mode 100755 (executable)
index 7edd0d5..0000000
Binary files a/repo-ng/jre-8u131-windows-i586.exe and /dev/null differ

diff --git a/repo-ng/jre-8u131-windows-x64.exe b/repo-ng/jre-8u131-windows-x64.exe
deleted file mode 100755 (executable)
index 027c592..0000000
Binary files a/repo-ng/jre-8u131-windows-x64.exe and /dev/null differ