From: Maximilian Grunow Date: Sun, 7 May 2023 20:40:01 +0000 (+0000) Subject: ♻️ updated to Java 8 Update 371 X-Git-Url: https://repo.cephalix.eu/gitweb/?a=commitdiff_plain;h=8054d7f7fd7b2871e489e4c84a4c1c99ff01a531;p=JavaRuntime.git ♻️ updated to Java 8 Update 371 --- diff --git a/.gitignore b/.gitignore index 7ea1f22..79f66f1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ oss-pkg-JavaRuntime.spec +.DS_Store +repo-ng/HASH.json diff --git a/FULLNAMES b/FULLNAMES index a653023..7ae440f 100644 --- 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 b83775e..5ade84e 100644 --- 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 c70fc0d..2423a30 100644 --- 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 6d1c30d..9229013 100644 --- 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 3140cad..2ad0921 100644 --- 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 cd3e3f7..453dc18 100644 --- 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 a1f82a2..67d19b9 100755 --- 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 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 index 027c592..0000000 Binary files a/repo-ng/jre-8u131-windows-x64.exe and /dev/null differ