diff options
| -rw-r--r-- | .SRCINFO | 50 | ||||
| -rw-r--r-- | LICENSE | 368 | ||||
| -rw-r--r-- | PKGBUILD | 58 | ||||
| -rw-r--r-- | java.desktop | 6 | ||||
| -rw-r--r-- | jconsole.desktop | 6 | ||||
| -rw-r--r-- | jdk.install | 4 | ||||
| -rw-r--r-- | jre.install | 2 | ||||
| -rw-r--r-- | jshell.desktop | 6 |
8 files changed, 198 insertions, 302 deletions
@@ -1,30 +1,30 @@ pkgbase = jdk pkgdesc = Oracle Java - pkgver = 16.0.2 - pkgrel = 2 + pkgver = 17 + pkgrel = 1 url = https://www.oracle.com/java/ arch = x86_64 license = custom makedepends = python-html2text - noextract = jdk-16.0.2_doc-all.zip - source = https://download.oracle.com/otn-pub/java/jdk/16.0.2+7/d4a915d82b4c4fbb9bde534da945d746/jdk-16.0.2_linux-x64_bin.tar.gz - source = https://download.oracle.com/otn-pub/java/jdk/16.0.2+7/d4a915d82b4c4fbb9bde534da945d746/jdk-16.0.2_doc-all.zip - source = java-16-jdk-license.html::https://download.oracle.com/otndocs/jcp/java_se-16-final-spec/license.html + noextract = jdk-17_doc-all.zip + source = https://download.oracle.com/java/17/archive/jdk-17_linux-x64_bin.tar.gz + source = https://download.oracle.com/otn-pub/java/jdk/17+35/0d483333a00540d886896bac774ff48b/jdk-17_doc-all.zip + source = java-17-jdk-license.html::https://download.oracle.com/otndocs/jcp/java_se-17-final-spec/license.html source = java.desktop source = jconsole.desktop source = jshell.desktop source = java_16.png source = java_48.png source = LICENSE - sha256sums = 630e3e56c58f45db3788343ce842756d5a5a401a63884242cc6a141071285a62 - sha256sums = 7cd96f9aa11d9e1a1adbee3e941a78e899bc9079370e4c12c106761d3df80f82 - sha256sums = 2f14da815e019b3f5558e5176c969227a2530bac1cfdfd42dbd6ccc2ee618346 - sha256sums = 9fc4cd168fd3e0d654093c1b2dd070f627ffae9b7f5c2c0741bac0b5c1ed0635 - sha256sums = 12b6e632e38e2c2ef54d6b03976290ca649380a89f78b5dae8827423eae52a1b - sha256sums = b2fd5a8f273a103569bf03af6f4ff4d3a5448472abc79b8649cecd0ee9313fc7 + sha256sums = 106e3fc31b9fe4d0fd76c6c92b1931bdd1b0ac4d788747951de0f92cc73b1ffe + sha256sums = 0b6870176449abdedae5c4a98ad69684f68831d02900b9b6ccea54213ff2cca7 + sha256sums = ab50940bda40a9e8935d1a8f002debda0fdd0b3e2bcc0319827ec19acd8b34f3 + sha256sums = f17fe6e3d1b7ffbe854364e127509144057878a344d74673393782b90b6f054a + sha256sums = 321dc88a1a0289c1f0a3113e75bd2f488829a0b82c11ac047272e464fb3f3ab3 + sha256sums = e7638e42cbe38f32cb7a1ec800c27408e8559f576d8dd7698fdd5856c4c9b842 sha256sums = d27fec1d74f7a3081c3d175ed184d15383666dc7f02cc0f7126f11549879c6ed sha256sums = 7cf8ca096e6d6e425b3434446b0835537d0fc7fe64b3ccba7a55f7bd86c7e176 - sha256sums = ef331c118f613261f06771161e9aebf8d26ab6cc131edd51358b01cc20fc759d + sha256sums = 20becfcac0bdeaa29a76e6966d727f8cc79381354cbd5d530cdec823954df19f pkgname = jre pkgdesc = Oracle Java Runtime Environment @@ -32,14 +32,20 @@ pkgname = jre depends = java-runtime-common depends = ca-certificates-utils depends = freetype2 + depends = libx11 + depends = libxext + depends = libxi depends = libxtst depends = libxrender - depends = libnet optdepends = alsa-lib: for basic sound support - provides = java-runtime=16 - provides = java-runtime-headless=16 - provides = java-runtime-jre=16 - provides = java-runtime-headless-jre=16 + optdepends = gtk2: for the Gtk+ 2 look and feel - desktop usage + optdepends = gtk3: for the Gtk+ 3 look and feel - desktop usage + provides = java-runtime=17 + provides = java-runtime-jdk17 + provides = jre17-jdk=17-1 + provides = java-runtime-headless=17 + provides = java-runtime-headless-jdk=17 + provides = jre17-jdk-headless=17-1 backup = etc/java-jdk/management/jmxremote.access backup = etc/java-jdk/management/jmxremote.password.template backup = etc/java-jdk/management/management.properties @@ -59,12 +65,12 @@ pkgname = jdk pkgdesc = Oracle Java Development Kit install = jdk.install depends = java-environment-common - depends = jre>=16 - depends = jre<17 + depends = jre=17-1 depends = zlib depends = hicolor-icon-theme - provides = java-environment=16 - provides = java-environment-jdk=16 + provides = java-environment=17 + provides = java-environment-jdk=17 + provides = jdk17-jdk=17-1 pkgname = jdk-doc pkgdesc = Oracle Java documentation @@ -1,242 +1,128 @@ -### Oracle Technology Network License Agreement for Oracle Java SE - - **Oracle is willing to authorize Your access to software associated with this -License Agreement ( "Agreement") only upon the condition that You accept that -this Agreement governs Your use of the software. By selecting the "Accept -License Agreement" button or box (or the equivalent) or installing or using -the Programs, You indicate Your acceptance of this Agreement and Your -agreement, as an authorized representative of Your company or organization (if -being acquired for use by an entity) or as an individual, to comply with the -license terms that apply to the software that You wish to download and access. -If You are not willing to be bound by this Agreement, do not select the -"Accept License Agreement" button or box (or the equivalent) and do not -download or access the software.** - -**Definitions** " **Oracle** " refers to Oracle America, Inc. - -" **You** " and " **Your** " refers to (a) a company or organization (" -**Entity** ") accessing the Programs, if use of the Programs will be on behalf -of such Entity; or (b) an individual accessing the Programs (" **Individual** -"), if use of the Programs will not be on behalf of an Entity. - -" **Contractors** " refers to Your agents and contractors (including, without -limitation, outsourcers). - -" **Development Use** " refers to Your internal use of the Programs to -develop, test, prototype and demonstrate Your Applications. For purposes of -clarity, the "to develop" grant includes using the Programs to run profilers, -debuggers and Integrated Development Environments (IDE Tools) where the -primary purpose of the IDE Tools is profiling, debugging and source code -editing Applications. - -" **Program(s)** " refers to Oracle software provided by Oracle pursuant to -this Agreement and any updates, error corrections, and/or Program -Documentation provided by Oracle. - -" **Program Documentation** " refers to the Licensing Information User Manual -for Oracle Java SE for the applicable version accessible at -[https://www.oracle.com/java/technologies/javase- -documentation.html](/java/technologies/javase-documentation.html) and other -documentation provided by Oracle with the Programs or accessible at -<https://docs.oracle.com/en/java>. - -" **Separate Terms** " refers to separate license terms that are specified in -the Program Documentation, readmes or notice files and that apply to -Separately Licensed Third Party Technology. - -" **Separately Licensed Third Party Technology** " refers to third party -technology that is licensed under Separate Terms and not under the terms of -this Agreement. - -" **Application** " refers to applications intended to run on the Java -Platform, Standard Edition. - -" **Personal Use** " refers to an Individual's use of the Programs solely on a -desktop or laptop computer under such Individual's control only to run -Personal Applications. - -" **Personal Applications** " refers to Applications designed for individual -personal use only, such as games or personal productivity tools. - -" **Oracle Approved Product Use** " refers to Your internal use of the -Programs only to run: (a) the product(s) identified as Schedule A Products at -<https://java.com/oaa>; and/or (b) software Applications developed using the -products identified as Schedule B Products at java.com/oaa by an Oracle -authorized licensee of such Schedule B Products. If You are unsure whether the -Application You intend to run using the Programs is developed using a Schedule -B Product, please contact your Application provider. - -" **Oracle Cloud Infrastructure Use ( "OCI Use")**" refers to Your use of the -Programs on Oracle's Cloud Infrastructure with the Oracle Cloud Infrastructure -products identified in the Oracle PaaS and IaaS Universal Credits Service -Descriptions available at <http://oracle.com/contracts> during the period in -which You maintain a subscription for such Oracle Cloud Infrastructure -products. - -**License Rights and Restrictions** Oracle grants You a nonexclusive, -nontransferable, limited license to use the Programs, subject to the -restrictions stated in this Agreement and Program Documentation, only for: - -(i) Personal Use, -(ii) Development Use, -(iii) Oracle Approved Product Use, and/or -(iv) Oracle Cloud Infrastructure Use. - -You may allow Your Contractor(s) to use the Programs, provided they are acting -on Your behalf to exercise license rights granted in this Agreement and -further provided that You are responsible for their compliance with this -Agreement in such use. You will have a written agreement with Your -Contractor(s) that strictly limits their right to use the Programs and that -otherwise protects Oracle's intellectual property rights to the same extent as -this Agreement. You may make copies of the Programs to the extent reasonably -necessary to exercise the license rights granted in this Agreement. - -You may not: - - * remove or modify any Program markings or any notice of Oracle's or a - licensor's proprietary rights; - * make the Programs available in any manner to any third party (other than - Contractors acting on Your behalf as set forth in this Agreement); - * assign this Agreement or distribute, give, or transfer the Programs or an - interest in them to any third party, except as expressly permitted in this - Agreement for Contractors (the foregoing shall not be construed to limit - the rights You may otherwise have with respect to Separately Licensed Third - Party Technology); - * cause or permit reverse engineering (unless required by law for - interoperability), disassembly or decompilation of the Programs; and - * create, modify, or change the behavior of, classes, interfaces, or - subpackages that are in any way identified as "java", "javax", "sun", - "oracle" or similar convention as specified by Oracle in any naming - convention designation. - -The Programs may contain source code that, unless expressly licensed in this -Agreement for other purposes (for example, licensed under an open source -license), is provided solely for reference purposes pursuant to the terms of -this Agreement and may not be modified. - -All rights not expressly granted in this Agreement are reserved by Oracle. If -You want to use the Programs for any purpose other than as expressly permitted -under this Agreement, You must obtain from Oracle or an Oracle reseller a -valid Program license under a separate agreement permitting such use. - -**Ownership** Oracle or its licensors retain all ownership and intellectual -property rights to the Programs. - -**Third-Party Technology** The Programs may contain or require the use of -third party technology that is provided with the Programs. Oracle may provide -certain notices to You in Program Documentation, readmes or notice files in -connection with such third party technology. Third party technology will be -licensed to You either under the terms of this Agreement or, if specified in -the Program Documentation, readmes or notice files, under Separate Terms. Your -rights to use Separately Licensed Third Party Technology under Separate Terms -are not restricted in any way by this Agreement. However, for clarity, -notwithstanding the existence of a notice, third party technology that is not -Separately Licensed Third Party Technology shall be deemed part of the -Programs and is licensed to You under the terms of this Agreement. - -**Source Code for Open Source Software** For software that You receive from -Oracle in binary form that is licensed under an open source license that gives -You the right to receive the source code for that binary, You can obtain a -copy of the applicable source code from https://oss.oracle.com/sources/ or +Oracle No-Fee Terms and Conditions (NFTC) + +Definitions + +"Oracle" refers to Oracle America, Inc. "You" and "Your" refers to (a) +a company or organization (each an "Entity") accessing the Programs, if +use of the Programs will be on behalf of such Entity; or (b) an +individual accessing the Programs, if use of the Programs will not be +on behalf of an Entity. "Program(s)" refers to Oracle software provided +by Oracle pursuant to the following terms and any updates, error +corrections, and/or Program Documentation provided by Oracle. "Program +Documentation" refers to Program user manuals and Program installation +manuals, if any. If available, Program Documentation may be delivered +with the Programs and/or may be accessed from +www.oracle.com/documentation. "Separate Terms" refers to separate +license terms that are specified in the Program Documentation, readmes +or notice files and that apply to Separately Licensed Technology. +"Separately Licensed Technology" refers to Oracle or third party +technology that is licensed under Separate Terms and not under the +terms of this license. + +Separately Licensed Technology + +Oracle may provide certain notices to You in Program Documentation, +readmes or notice files in connection with Oracle or third party +technology provided as or with the Programs. If specified in the +Program Documentation, readmes or notice files, such technology will be +licensed to You under Separate Terms. Your rights to use Separately +Licensed Technology under Separate Terms are not restricted in any way +by the terms herein. For clarity, notwithstanding the existence of a +notice, third party technology that is not Separately Licensed +Technology shall be deemed part of the Programs licensed to You under +the terms of this license. + +Source Code for Open Source Software + +For software that You receive from Oracle in binary form that is +licensed under an open source license that gives You the right to +receive the source code for that binary, You can obtain a copy of the +applicable source code from https://oss.oracle.com/sources/ or http://www.oracle.com/goto/opensourcecode. If the source code for such -software was not provided to You with the binary, You can also receive a copy -of the source code on physical media by submitting a written request pursuant -to the instructions in the "Written Offer for Source Code" section of the -latter website. - -**Export Controls** Export laws and regulations of the United States and any -other relevant local export laws and regulations apply to the Programs. You -agree that such export control laws govern Your use of the Programs (including -technical data) and any services deliverables provided under this agreement, -and You agree to comply with all such export laws and regulations (including -"deemed export" and "deemed re-export" regulations). You agree that no data, -information, program and/or materials resulting from Programs or services (or -direct products thereof) will be exported, directly or indirectly, in -violation of these laws, or will be used for any purpose prohibited by these -laws including, without limitation, nuclear, chemical, or biological weapons -proliferation, or development of missile technology. Accordingly, You confirm: - - * You will not download, provide, make available or otherwise export or - re-export the Programs, directly or indirectly, to countries prohibited by - applicable laws and regulations nor to citizens, nationals or residents of - those countries. - * You are not listed on the United States Department of Treasury lists of - Specially Designated Nationals and Blocked Persons, Specially Designated - Terrorists, and Specially Designated Narcotic Traffickers, nor are You - listed on the United States Department of Commerce Table of Denial Orders. - * You will not download or otherwise export or re-export the Programs, - directly or indirectly, to persons on the above mentioned lists. - * You will not use the Programs for, and will not allow the Programs to be - used for, any purposes prohibited by applicable law, including, without - limitation, for the development, design, manufacture or production of - nuclear, chemical or biological weapons of mass destruction. - -**Information Collection** The Programs' installation and/or update processes, -if any, may transmit a limited amount of data to Oracle or its service -provider about those processes to help Oracle understand and optimize them. -Oracle does not associate the data with personally identifiable information. -Refer to Oracle's Privacy Policy at -[www.oracle.com/privacy](/legal/privacy/privacy-policy.html). - -**Disclaimer of Warranties; Limitation of Liability THE PROGRAMS ARE PROVIDED -"AS IS" WITHOUT WARRANTY OF ANY KIND. ORACLE FURTHER DISCLAIMS ALL WARRANTIES, -EXPRESS AND IMPLIED, INCLUDING WITHOUT LIMITATION, ANY IMPLIED WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NONINFRINGEMENT.** - -**IN NO EVENT WILL ORACLE BE LIABLE FOR ANY INDIRECT, INCIDENTAL, SPECIAL, -PUNITIVE OR CONSEQUENTIAL DAMAGES, OR DAMAGES FOR LOSS OF PROFITS, REVENUE, -DATA OR DATA USE, INCURRED BY YOU OR ANY THIRD PARTY, WHETHER IN AN ACTION IN -CONTRACT OR TORT, EVEN IF ORACLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. ORACLE'S ENTIRE LIABILITY FOR DAMAGES UNDER THIS AGREEMENT SHALL IN -NO EVENT EXCEED ONE THOUSAND DOLLARS (U.S. $1,000).** - -**No Technical Support** Oracle does not provide technical support, phone -support, or updates under this Agreement. - -**Audit; Termination** Oracle may audit an Entity's use of the Programs. You -may terminate this Agreement by destroying all copies of the Programs. This -Agreement shall automatically terminate without notice if You fail to comply -with any of the terms of this Agreement, in which case You shall promptly -destroy all copies of the Programs. - -**Relationship Between the Parties** Oracle is an independent contractor and -we agree that no partnership, joint venture, or agency relationship exists -between us. We each will be responsible for paying our own employees, -including employment related taxes and insurance. Nothing in this Agreement -shall be construed to limit either party's right to independently develop or -distribute software that is functionally similar to the other party's -products, so long as proprietary information of the other party is not -included in such software. - -**Entire Agreement; Governing Law** You agree that this Agreement is the -complete agreement for the Programs and this Agreement supersedes all prior or -contemporaneous agreements or representations, including any clickwrap, -shrinkwrap or similar licenses, or license agreements for prior versions of -the Programs. This Agreement may not be modified and the rights and -restrictions may not be altered or waived except in a writing signed by -authorized representatives of You and of Oracle. If any term of this Agreement -is found to be invalid or unenforceable, the remaining provisions will remain -effective. - -This Agreement is governed by the substantive and procedural laws of the State -of California, USA, and You and Oracle agree to submit to the exclusive -jurisdiction of, and venue in, the courts of San Francisco or Santa Clara -counties in California in any dispute arising out of or relating to this -Agreement. - -**Notices** Should You have any questions concerning this Agreement, or if You -desire to contact Oracle for any reason, please write: - -Oracle America, Inc. -500 Oracle Parkway -Redwood City, CA 94065 - -**Oracle Employees** : Under no circumstances are Oracle employees authorized -to download software for the purpose of distributing it to customers. Oracle -products are available to Oracle employees for internal use or demonstration -purposes only. In keeping with Oracle's trade compliance obligations under -U.S. and applicable multilateral law, an Oracle employee's failure to comply -with this policy could result in disciplinary action up to and including -termination. - -Last updated: April 10, 2019 +software was not provided to You with the binary, You can also receive +a copy of the source code on physical media by submitting a written +request pursuant to the instructions in the "Written Offer for Source +Code" section of the latter website. + +----------------------------------------------------------------------- +-------- + +The following license terms apply to those Programs that are not +provided to You under Separate Terms. + +License Rights and Restrictions + +Oracle grants to You, as a recipient of this Program, subject to the +conditions stated herein, a nonexclusive, nontransferable, limited +license to: + +(a) internally use the unmodified Programs for the purposes of +developing, testing, prototyping and demonstrating your applications, +and running the Program for Your own personal use or internal business +operations; and + +(b) redistribute the unmodified Program and Program Documentation, +under the terms of this License, provided that You do not charge Your +licensees any fees associated with such distribution or use of the +Program, including, without limitation, fees for products that include +or are bundled with a copy of the Program or for services that involve +the use of the distributed Program. + +You may make copies of the Programs to the extent reasonably necessary +for exercising the license rights granted herein and for backup +purposes. You are granted the right to use the Programs to provide +third party training in the use of the Programs and associated +Separately Licensed Technology only if there is express authorization +of such use by Oracle on the Program's download page or in the Program +Documentation. + +Your license is contingent on compliance with the following conditions: + +- You do not remove markings or notices of either Oracle's or a +licensor's proprietary rights from the Programs or Program +Documentation; + +- You comply with all U.S. and applicable export control and economic +sanctions laws and regulations that govern Your use of the Programs +(including technical data); + +- You do not cause or permit reverse engineering, disassembly or +decompilation of the Programs (except as allowed by law) by You nor +allow an associated party to do so. + +For clarity, any source code that may be included in the distribution +with the Programs is provided solely for reference purposes and may not +be modified, unless such source code is under Separate Terms permitting +modification. + +Ownership + +Oracle or its licensors retain all ownership and intellectual property +rights to the Programs. + +Information Collection + +The Programs' installation and/or auto-update processes, if any, may +transmit a limited amount of data to Oracle or its service provider +about those processes to help Oracle understand and optimize them. +Oracle does not associate the data with personally identifiable +information. Refer to Oracle's Privacy Policy at +www.oracle.com/privacy. + +Disclaimer of Warranties; Limitation of Liability + +THE PROGRAMS ARE PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. ORACLE +FURTHER DISCLAIMS ALL WARRANTIES, EXPRESS AND IMPLIED, INCLUDING +WITHOUT LIMITATION, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE, OR NONINFRINGEMENT. + +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW WILL ORACLE BE LIABLE TO +YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + +Last updated: 12 September 2021 @@ -3,17 +3,17 @@ pkgbase=jdk pkgname=('jre' 'jdk' 'jdk-doc') -pkgver=16.0.2 -_build=7 -_hash=d4a915d82b4c4fbb9bde534da945d746 +pkgver=17 +_build=35 +_hash=0d483333a00540d886896bac774ff48b _majver="${pkgver%%.*}" -pkgrel=2 +pkgrel=1 pkgdesc='Oracle Java' arch=('x86_64') url='https://www.oracle.com/java/' license=('custom') makedepends=('python-html2text') -source=("https://download.oracle.com/otn-pub/java/jdk/${pkgver}+${_build}/${_hash}/jdk-${pkgver}_linux-x64_bin.tar.gz" +source=("https://download.oracle.com/java/${_majver}/archive/jdk-${pkgver}_linux-x64_bin.tar.gz" "https://download.oracle.com/otn-pub/java/jdk/${pkgver}+${_build}/${_hash}/jdk-${pkgver}_doc-all.zip" "java-${_majver}-jdk-license.html"::"https://download.oracle.com/otndocs/jcp/java_se-${_majver}-final-spec/license.html" 'java.desktop' @@ -23,15 +23,15 @@ source=("https://download.oracle.com/otn-pub/java/jdk/${pkgver}+${_build}/${_has 'java_48.png' 'LICENSE') noextract=("jdk-${pkgver}_doc-all.zip") -sha256sums=('630e3e56c58f45db3788343ce842756d5a5a401a63884242cc6a141071285a62' - '7cd96f9aa11d9e1a1adbee3e941a78e899bc9079370e4c12c106761d3df80f82' - '2f14da815e019b3f5558e5176c969227a2530bac1cfdfd42dbd6ccc2ee618346' - '9fc4cd168fd3e0d654093c1b2dd070f627ffae9b7f5c2c0741bac0b5c1ed0635' - '12b6e632e38e2c2ef54d6b03976290ca649380a89f78b5dae8827423eae52a1b' - 'b2fd5a8f273a103569bf03af6f4ff4d3a5448472abc79b8649cecd0ee9313fc7' +sha256sums=('106e3fc31b9fe4d0fd76c6c92b1931bdd1b0ac4d788747951de0f92cc73b1ffe' + '0b6870176449abdedae5c4a98ad69684f68831d02900b9b6ccea54213ff2cca7' + 'ab50940bda40a9e8935d1a8f002debda0fdd0b3e2bcc0319827ec19acd8b34f3' + 'f17fe6e3d1b7ffbe854364e127509144057878a344d74673393782b90b6f054a' + '321dc88a1a0289c1f0a3113e75bd2f488829a0b82c11ac047272e464fb3f3ab3' + 'e7638e42cbe38f32cb7a1ec800c27408e8559f576d8dd7698fdd5856c4c9b842' 'd27fec1d74f7a3081c3d175ed184d15383666dc7f02cc0f7126f11549879c6ed' '7cf8ca096e6d6e425b3434446b0835537d0fc7fe64b3ccba7a55f7bd86c7e176' - 'ef331c118f613261f06771161e9aebf8d26ab6cc131edd51358b01cc20fc759d') + '20becfcac0bdeaa29a76e6966d727f8cc79381354cbd5d530cdec823954df19f') DLAGENTS=('https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -b oraclelicense=a -o %o %u') @@ -43,11 +43,15 @@ prepare() { package_jre() { pkgdesc+=' Runtime Environment' - depends=('java-runtime-common' 'ca-certificates-utils' 'freetype2' 'libxtst' - 'libxrender' 'libnet') - optdepends=('alsa-lib: for basic sound support') - provides=("java-runtime=${_majver}" "java-runtime-headless=${_majver}" - "java-runtime-jre=${_majver}" "java-runtime-headless-jre=${_majver}") + depends=('java-runtime-common' 'ca-certificates-utils' 'freetype2' 'libx11' 'libxext' + 'libxi' 'libxtst' 'libxrender') + optdepends=('alsa-lib: for basic sound support' + 'gtk2: for the Gtk+ 2 look and feel - desktop usage' + 'gtk3: for the Gtk+ 3 look and feel - desktop usage') + provides=("java-runtime=${_majver}" "java-runtime-jdk${_majver}" + "jre${_majver}-jdk=${pkgver}-${pkgrel}" + "java-runtime-headless=${_majver}" "java-runtime-headless-jdk=${_majver}" + "jre${_majver}-jdk-headless="${pkgver}-${pkgrel}) backup=("etc/java-${pkgbase}/management/jmxremote.access" "etc/java-${pkgbase}/management/jmxremote.password.template" "etc/java-${pkgbase}/management/management.properties" @@ -76,24 +80,23 @@ package_jre() { ln -s "../../../../etc/java-${pkgbase}" "${pkgdir}/${_jvmdir}/conf" # bin - install -D -m755 bin/{java,jpackage,jrunscript} -t "${pkgdir}/${_jvmdir}/bin" - install -D -m755 bin/{keytool,rmid,rmiregistry} -t "${pkgdir}/${_jvmdir}/bin" + install -D -m755 bin/{java,jfr,jrunscript} -t "${pkgdir}/${_jvmdir}/bin" + install -D -m755 bin/{keytool,rmiregistry} -t "${pkgdir}/${_jvmdir}/bin" # libs cp -a lib "${pkgdir}/${_jvmdir}" - rm -r "${pkgdir}/${_jvmdir}/lib/jfr" rm "${pkgdir}/${_jvmdir}/lib/"{ct.sym,libattach.so,libsaproc.so,src.zip} # man pages local _file - for _file in man/man1/{java,jpackage,jrunscript,keytool,rmid,rmiregistry}.1 + for _file in man/man1/{java,jfr,jrunscript,keytool,rmiregistry}.1 do install -D -m644 "$_file" "${pkgdir}/usr/share/${_file%.1}-jdk${_majver}.1" done install -D -m644 release -t "${pkgdir}/${_jvmdir}" - # replace JKS keystore with ca-certificates-utils + # link JKS keystore from ca-certificates-utils rm "${pkgdir}${_jvmdir}/lib/security/cacerts" ln -s /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/lib/security/cacerts" @@ -106,8 +109,10 @@ package_jre() { package_jdk() { pkgdesc+=' Development Kit' - depends=('java-environment-common' "jre>=${_majver}" "jre<$((_majver + 1))" 'zlib' 'hicolor-icon-theme') - provides=("java-environment=${_majver}" "java-environment-jdk=${_majver}") + depends=('java-environment-common' "jre=${pkgver}-${pkgrel}" 'zlib' + 'hicolor-icon-theme') + provides=("java-environment=${_majver}" "java-environment-jdk=${_majver}" + "jdk${_majver}-jdk=${pkgver}-${pkgrel}") install=jdk.install cd "jdk-${pkgver}" @@ -118,13 +123,12 @@ package_jdk() { # bin cp -a bin "${pkgdir}/${_jvmdir}" - rm "${pkgdir}/${_jvmdir}/bin/"{java,jpackage,jrunscript,keytool,rmid,rmiregistry} + rm "${pkgdir}/${_jvmdir}/bin/"{java,jfr,jrunscript,keytool,rmiregistry} # libs install -D -m644 lib/ct.sym -t "${pkgdir}/${_jvmdir}/lib" install -D -m644 lib/libattach.so -t "${pkgdir}/${_jvmdir}/lib" install -D -m644 lib/libsaproc.so -t "${pkgdir}/${_jvmdir}/lib" - cp -a lib/jfr "${pkgdir}/${_jvmdir}/lib" cp -a include "${pkgdir}/${_jvmdir}" cp -a jmods "${pkgdir}/${_jvmdir}" @@ -144,7 +148,7 @@ package_jdk() { do install -D -m644 "$_file" "${pkgdir}/usr/share/${_file%.1}-jdk${_majver}.1" done < <(find man/man1 -type f -print0) - rm "${pkgdir}/usr/share/man/man1/"{java,jpackage,jrunscript,keytool,rmid,rmiregistry}-jdk"${_majver}".1 + rm "${pkgdir}/usr/share/man/man1/"{java,jfr,jrunscript,keytool,rmiregistry}-jdk"${_majver}".1 # legal/licenses cp -a legal/* "${pkgdir}/usr/share/licenses/${pkgname}" diff --git a/java.desktop b/java.desktop index 714d7b94c455..da271be2da78 100644 --- a/java.desktop +++ b/java.desktop @@ -1,8 +1,8 @@ [Desktop Entry] -Name=Oracle Java 16 Runtime -Comment=Oracle Java 16 Runtime +Name=Oracle Java 17 Runtime +Comment=Oracle Java 17 Runtime Keywords=java;runtime -Exec=/usr/lib/jvm/java-16-jdk/bin/java -jar +Exec=/usr/lib/jvm/java-17-jdk/bin/java -jar Terminal=false Type=Application Icon=java-jdk diff --git a/jconsole.desktop b/jconsole.desktop index e0a6954a661f..f73df6a198d4 100644 --- a/jconsole.desktop +++ b/jconsole.desktop @@ -1,8 +1,8 @@ [Desktop Entry] -Name=Oracle Java 16 Console -Comment=Oracle Java 16 Monitoring and Management Console +Name=Oracle Java 17 Console +Comment=Oracle Java 17 Monitoring and Management Console Keywords=java;console;monitoring -Exec=/usr/lib/jvm/java-16-jdk/bin/jconsole +Exec=/usr/lib/jvm/java-17-jdk/bin/jconsole Terminal=false Type=Application Icon=java-jdk diff --git a/jdk.install b/jdk.install index ae205a066c1d..c6e4e47ef7d3 100644 --- a/jdk.install +++ b/jdk.install @@ -1,4 +1,4 @@ -THIS_JDK='java-16-jdk' +THIS_JDK='java-17-jdk' fix_default() { if [ ! -x /usr/bin/java ]; then @@ -42,7 +42,7 @@ post_upgrade() { pre_remove() { if [ "x$(fix_default)" = "x${THIS_JDK}" ]; then - # Check JRE16 is still available + # Check JRE17 is still available if [ -x /usr/lib/jvm/${THIS_JDK}/bin/java ]; then /usr/bin/archlinux-java unset fi diff --git a/jre.install b/jre.install index 5d07d4a4f918..b26706c05018 100644 --- a/jre.install +++ b/jre.install @@ -1,4 +1,4 @@ -THIS_JRE='java-16-jdk' +THIS_JRE='java-17-jdk' fix_default() { if [ ! -x /usr/bin/java ]; then diff --git a/jshell.desktop b/jshell.desktop index 1d14abde4acd..818ed8d66d6a 100644 --- a/jshell.desktop +++ b/jshell.desktop @@ -1,8 +1,8 @@ [Desktop Entry] -Name=Oracle Java 16 Shell -Comment=Oracle Java 16 Shell +Name=Oracle Java 17 Shell +Comment=Oracle Java 17 Shell Keywords=java;shell -Exec=/usr/lib/jvm/java-16-jdk/bin/jshell +Exec=/usr/lib/jvm/java-17-jdk/bin/jshell Terminal=true Type=Application Icon=java-jdk |