From 39b7d86c2d6044202aea82056aba4d4cef8772fd Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Tue, 24 May 2022 15:35:25 +0200 Subject: [PATCH 1/7] Move to openjdk11 Weekly versions of Jenkins will need JDK11 starting from June --- components/developer/jenkins-core-weekly/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/developer/jenkins-core-weekly/Makefile b/components/developer/jenkins-core-weekly/Makefile index 652f11ff34c..f692878adf0 100644 --- a/components/developer/jenkins-core-weekly/Makefile +++ b/components/developer/jenkins-core-weekly/Makefile @@ -86,4 +86,4 @@ install: $(INSTALL_32) test: $(NO_TESTS) # Auto-generated dependencies -REQUIRED_PACKAGES += runtime/java/openjdk8 +REQUIRED_PACKAGES += runtime/java/openjdk11 From 378a4c66418e5f117a104602656a069be3b41def Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Thu, 26 May 2022 06:13:57 +0200 Subject: [PATCH 2/7] Move to Github for rddtool. On the site https://oss.oetiker.ch/rrdtool/pub/ we see: RRDtool Downloads moved to GitHub! So, this is proper place for source file(s): https://github.com/oetiker/rrdtool-1.x/releases. Thanks to @3eka for pointing that out. --- components/image/rrdtool/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/image/rrdtool/Makefile b/components/image/rrdtool/Makefile index e211f771fb1..4109b7af031 100644 --- a/components/image/rrdtool/Makefile +++ b/components/image/rrdtool/Makefile @@ -20,7 +20,7 @@ include ../../../make-rules/shared-macros.mk COMPONENT_NAME= rrdtool -COMPONENT_VERSION= 1.7.2 +COMPONENT_VERSION= 1.8.0 COMPONENT_FMRI= image/rrdtool COMPONENT_CLASSIFICATION=Applications/System Utilities COMPONENT_SUMMARY= Data analysis tool generating graphical representations @@ -30,9 +30,9 @@ COMPONENT_DESCRIPTION= RRDtool is the OpenSource industry standard, high perform applications. COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz -COMPONENT_ARCHIVE_HASH= sha256:a199faeb7eff7cafc46fac253e682d833d08932f3db93a550a4a5af180ca58db -COMPONENT_ARCHIVE_URL= http://oss.oetiker.ch/rrdtool/pub/$(COMPONENT_ARCHIVE) -COMPONENT_PROJECT_URL= http://oss.oetiker.ch/rrdtool/ +COMPONENT_ARCHIVE_HASH= sha256:bd37614137d7a8dc523359648eb2a81631a34fd91a82ed5581916a52c08433f4 +COMPONENT_ARCHIVE_URL= https://github.com/oetiker/rrdtool-1.x/releases/download/v$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE) +COMPONENT_PROJECT_URL= https://github.com/oetiker/rrdtool-1.x COMPONENT_LICENSE= GPLv2 COMPONENT_LICENSE_FILE= LICENSE From 8e1378529c7c278dc8061660b78d26f47a2fd83b Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Thu, 26 May 2022 07:43:53 +0200 Subject: [PATCH 3/7] RRDtool Downloads moved to GitHub! So, this is proper place for source file(s): https://github.com/oetiker/rrdtool-1.x/releases. Thanks to @3eka for pointing that out. --- components/image/rrdtool/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/image/rrdtool/Makefile b/components/image/rrdtool/Makefile index e211f771fb1..4109b7af031 100644 --- a/components/image/rrdtool/Makefile +++ b/components/image/rrdtool/Makefile @@ -20,7 +20,7 @@ include ../../../make-rules/shared-macros.mk COMPONENT_NAME= rrdtool -COMPONENT_VERSION= 1.7.2 +COMPONENT_VERSION= 1.8.0 COMPONENT_FMRI= image/rrdtool COMPONENT_CLASSIFICATION=Applications/System Utilities COMPONENT_SUMMARY= Data analysis tool generating graphical representations @@ -30,9 +30,9 @@ COMPONENT_DESCRIPTION= RRDtool is the OpenSource industry standard, high perform applications. COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz -COMPONENT_ARCHIVE_HASH= sha256:a199faeb7eff7cafc46fac253e682d833d08932f3db93a550a4a5af180ca58db -COMPONENT_ARCHIVE_URL= http://oss.oetiker.ch/rrdtool/pub/$(COMPONENT_ARCHIVE) -COMPONENT_PROJECT_URL= http://oss.oetiker.ch/rrdtool/ +COMPONENT_ARCHIVE_HASH= sha256:bd37614137d7a8dc523359648eb2a81631a34fd91a82ed5581916a52c08433f4 +COMPONENT_ARCHIVE_URL= https://github.com/oetiker/rrdtool-1.x/releases/download/v$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE) +COMPONENT_PROJECT_URL= https://github.com/oetiker/rrdtool-1.x COMPONENT_LICENSE= GPLv2 COMPONENT_LICENSE_FILE= LICENSE From 5fdf11deed7aa292588fce2a4654a99433b27181 Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Thu, 26 May 2022 08:24:39 +0200 Subject: [PATCH 4/7] Changed the babl download site. ssl.CertificateError: hostname 'ftp.gimp.org' doesn't match either of 'download.gimp.org', 'gimp.org' --- components/library/babl/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/library/babl/Makefile b/components/library/babl/Makefile index 6453afa6acc..6bb026b4648 100644 --- a/components/library/babl/Makefile +++ b/components/library/babl/Makefile @@ -25,7 +25,7 @@ COMPONENT_SUMMARY= Babl is a dynamic, any to any, pixel format conversion librar COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz COMPONENT_ARCHIVE_HASH= -COMPONENT_ARCHIVE_URL= https://ftp.gimp.org/pub/babl/0.1/$(COMPONENT_ARCHIVE) +COMPONENT_ARCHIVE_URL= https://download.gimp.org/pub/babl/0.1/$(COMPONENT_ARCHIVE) COMPONENT_PROJECT_URL= https://gegl.org/babl/ COMPONENT_FMRI= image/library/babl COMPONENT_CLASSIFICATION= System/Multimedia Libraries From 1aad1700d78dcc0a6e238cb1e961ee820a566a91 Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Thu, 26 May 2022 08:35:08 +0200 Subject: [PATCH 5/7] Moved the JDK dependency to 11. There may be a problem with 386 builds, as openJDK 11 doesn't exist for 386. --- components/developer/jenkins/Makefile | 6 +++--- .../developer/jenkins/jenkins-standalone.p5m | 2 +- components/developer/jenkins/jenkins.p5m | 2 +- components/developer/jenkins/pkg5 | 14 ++++++++++++++ 4 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 components/developer/jenkins/pkg5 diff --git a/components/developer/jenkins/Makefile b/components/developer/jenkins/Makefile index cf2d0069183..5fc4ed9c972 100644 --- a/components/developer/jenkins/Makefile +++ b/components/developer/jenkins/Makefile @@ -19,8 +19,8 @@ include ../../../make-rules/shared-macros.mk # Due to this, initial version for helper packages starts from that. COMPONENT_NAME= jenkins -COMPONENT_VERSION= 2.65 -COMPONENT_REVISION= 3 +COMPONENT_VERSION= 2.66 +COMPONENT_REVISION= 1 COMPONENT_FMRI= developer/jenkins COMPONENT_CLASSIFICATION= Web Services/Application and Web Servers COMPONENT_PROJECT_URL= http://jenkins-ci.org/ @@ -48,5 +48,5 @@ install: test: $(NO_TESTS) # Auto-generated dependencies +REQUIRED_PACKAGES += runtime/java/openjdk11 REQUIRED_PACKAGES += SUNWcs -REQUIRED_PACKAGES += runtime/java/openjdk8 diff --git a/components/developer/jenkins/jenkins-standalone.p5m b/components/developer/jenkins/jenkins-standalone.p5m index 6e2a098a8ab..7a1ecd9c5eb 100644 --- a/components/developer/jenkins/jenkins-standalone.p5m +++ b/components/developer/jenkins/jenkins-standalone.p5m @@ -33,7 +33,7 @@ depend type=require-any \ fmri=pkg:/developer/jenkins-core-weekly \ fmri=pkg:/developer/jenkins-core-lts depend type=require \ - fmri=pkg:/runtime/java/openjdk8 + fmri=pkg:/runtime/java/openjdk11 # The font is required by Jenkins Web-GUI to start up, see # https://wiki.jenkins.io/display/JENKINS/Jenkins+got+java.awt.headless+problem depend type=require \ diff --git a/components/developer/jenkins/jenkins.p5m b/components/developer/jenkins/jenkins.p5m index b15862f6aff..94527f6bf68 100644 --- a/components/developer/jenkins/jenkins.p5m +++ b/components/developer/jenkins/jenkins.p5m @@ -31,7 +31,7 @@ depend type=require-any \ fmri=pkg:/developer/jenkins-core-weekly \ fmri=pkg:/developer/jenkins-core-lts depend type=require \ - fmri=pkg:/runtime/java/openjdk8 + fmri=pkg:/runtime/java/openjdk11 # Note: eventually we expect further packages for other webapp-server # integrations (like tomcat, glassfish, etc.) - those would probably put a diff --git a/components/developer/jenkins/pkg5 b/components/developer/jenkins/pkg5 new file mode 100644 index 00000000000..06071e0ee8e --- /dev/null +++ b/components/developer/jenkins/pkg5 @@ -0,0 +1,14 @@ +{ + "dependencies": [ + "SUNWcs", + "runtime/java/openjdk11", + "shell/ksh93", + "system/library" + ], + "fmris": [ + "developer/jenkins", + "developer/jenkins-common", + "developer/jenkins-standalone" + ], + "name": "jenkins" +} \ No newline at end of file From 9baa142b95604fdd37385fed88892f392d4fc8df Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Fri, 27 May 2022 20:11:03 +0200 Subject: [PATCH 6/7] Added JDK11 dependency for LTS version JDK11 dependency will be mandatory only in September 2022. --- components/developer/jenkins-core-lts/Makefile | 3 ++- components/developer/jenkins-core-lts/jenkins-core-lts.p5m | 4 ++-- components/developer/jenkins-core-lts/pkg5 | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/components/developer/jenkins-core-lts/Makefile b/components/developer/jenkins-core-lts/Makefile index a5a2c6003a8..a6905821026 100644 --- a/components/developer/jenkins-core-lts/Makefile +++ b/components/developer/jenkins-core-lts/Makefile @@ -29,6 +29,7 @@ JENKINS_RELEASE= lts COMPONENT_MAJOR_VERSION= 2 COMPONENT_MINOR_VERSION= 332 COMPONENT_PATCH_VERSION= 3 +COMPONENT_REVISION= 1 COMPONENT_ARCHIVE_HASH= sha256:d193f179aadf3a7ceb61adebc3ab51218ac4a7852b88932ff33b44fd7be6010f # See $(COMPONENT_ARCHIVE_URL).sha256 e.g. for current weekly release, run # wget -O - http://mirrors.jenkins-ci.org/war/latest/jenkins.war.sha256 @@ -86,4 +87,4 @@ install: $(INSTALL_32) test: $(NO_TESTS) # Auto-generated dependencies -REQUIRED_PACKAGES += runtime/java/openjdk8 +REQUIRED_PACKAGES += runtime/java/openjdk11 diff --git a/components/developer/jenkins-core-lts/jenkins-core-lts.p5m b/components/developer/jenkins-core-lts/jenkins-core-lts.p5m index 8fe994be958..0df24359783 100644 --- a/components/developer/jenkins-core-lts/jenkins-core-lts.p5m +++ b/components/developer/jenkins-core-lts/jenkins-core-lts.p5m @@ -22,8 +22,8 @@ set name=org.opensolaris.consolidation value=$(CONSOLIDATION) license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)' -# Note: java8+ is required since 2017 -# This may be JRE8 for the server, though JDK8 also suffices :) +# Note: java11 is required since June 2022 +# This may be JRE11 for the server, though JDK11 also suffices :) depend fmri=__TBD pkg.debug.depend.file=usr/bin/java type=require # Note: as we deliver the new WAR file, we tell the appservers to refresh diff --git a/components/developer/jenkins-core-lts/pkg5 b/components/developer/jenkins-core-lts/pkg5 index ade90ff533d..ad54cb6d21c 100644 --- a/components/developer/jenkins-core-lts/pkg5 +++ b/components/developer/jenkins-core-lts/pkg5 @@ -1,7 +1,7 @@ { "dependencies": [ "SUNWcs", - "runtime/java/openjdk8", + "runtime/java/openjdk11", "shell/ksh93", "system/library" ], From be544ea1e8c404172a89ff57bc309ed8649057b0 Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Fri, 27 May 2022 20:17:21 +0200 Subject: [PATCH 7/7] Moved the JDK dependency to 11. --- components/developer/jenkins-core-weekly/Makefile | 1 + components/developer/jenkins-core-weekly/pkg5 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/components/developer/jenkins-core-weekly/Makefile b/components/developer/jenkins-core-weekly/Makefile index 4c6057fd92b..14edb6542c4 100644 --- a/components/developer/jenkins-core-weekly/Makefile +++ b/components/developer/jenkins-core-weekly/Makefile @@ -29,6 +29,7 @@ JENKINS_RELEASE= weekly COMPONENT_MAJOR_VERSION= 2 COMPONENT_MINOR_VERSION= 349 COMPONENT_ARCHIVE_HASH= sha256:577af2f74652065db805f4dfbe70658cfe0270d49e6258d74101493de8b13a1b +COMPONENT_REVISION= 1 # See $(COMPONENT_ARCHIVE_URL).sha256 e.g. for current weekly release, run # wget -O - http://mirrors.jenkins-ci.org/war/latest/jenkins.war.sha256 # or for LTS diff --git a/components/developer/jenkins-core-weekly/pkg5 b/components/developer/jenkins-core-weekly/pkg5 index 9f9db664107..0be9c9abedd 100644 --- a/components/developer/jenkins-core-weekly/pkg5 +++ b/components/developer/jenkins-core-weekly/pkg5 @@ -1,7 +1,7 @@ { "dependencies": [ "SUNWcs", - "runtime/java/openjdk8", + "runtime/java/openjdk11", "shell/ksh93", "system/library" ],