commit 873f25a0e2a094261c5edc455dd6c455d1487102 Author: Tim Biermann <tbier@posteo.de> Date: Sun Nov 14 18:13:38 2021 +0100 [notify] openjdk8: removed dependency, now optional: krb5; cleaned up outdated build flags diff --git a/openjdk8/.footprint b/openjdk8/.footprint index 02cec78bf..33d476fbc 100644 --- a/openjdk8/.footprint +++ b/openjdk8/.footprint @@ -14,11 +14,11 @@ drwxr-xr-x root/root usr/lib/java/openjdk8/bin/ -rwxr-xr-x root/root usr/lib/java/openjdk8/bin/jar -rwxr-xr-x root/root usr/lib/java/openjdk8/bin/jarsigner -rwxr-xr-x root/root usr/lib/java/openjdk8/bin/java --rwxr-xr-x root/root usr/lib/java/openjdk8/bin/java-rmi.cgi -rwxr-xr-x root/root usr/lib/java/openjdk8/bin/javac -rwxr-xr-x root/root usr/lib/java/openjdk8/bin/javadoc -rwxr-xr-x root/root usr/lib/java/openjdk8/bin/javah -rwxr-xr-x root/root usr/lib/java/openjdk8/bin/javap +-rwxr-xr-x root/root usr/lib/java/openjdk8/bin/java-rmi.cgi -rwxr-xr-x root/root usr/lib/java/openjdk8/bin/jcmd -rwxr-xr-x root/root usr/lib/java/openjdk8/bin/jconsole -rwxr-xr-x root/root usr/lib/java/openjdk8/bin/jdb @@ -55,8 +55,8 @@ drwxr-xr-x root/root usr/lib/java/openjdk8/include/ -rw-r--r-- root/root usr/lib/java/openjdk8/include/jawt.h -rw-r--r-- root/root usr/lib/java/openjdk8/include/jdwpTransport.h -rw-r--r-- root/root usr/lib/java/openjdk8/include/jni.h --rw-r--r-- root/root usr/lib/java/openjdk8/include/jvmti.h -rw-r--r-- root/root usr/lib/java/openjdk8/include/jvmticmlr.h +-rw-r--r-- root/root usr/lib/java/openjdk8/include/jvmti.h drwxr-xr-x root/root usr/lib/java/openjdk8/include/linux/ -rw-r--r-- root/root usr/lib/java/openjdk8/include/linux/jawt_md.h -rw-r--r-- root/root usr/lib/java/openjdk8/include/linux/jni_md.h @@ -79,29 +79,28 @@ drwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/jli/ lrwxrwxrwx root/root usr/lib/java/openjdk8/jre/lib/amd64/jli/libjli.so -> ../../../../lib/amd64/jli/libjli.so -rw-r--r-- root/root usr/lib/java/openjdk8/jre/lib/amd64/jvm.cfg -rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/libattach.so --rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/libawt.so -rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/libawt_headless.so +-rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/libawt.so -rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/libawt_xawt.so -rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/libdt_socket.so -rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/libfontmanager.so -rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/libhprof.so -rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/libinstrument.so -rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/libj2gss.so --rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/libj2krb5.so -rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/libj2pcsc.so -rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/libj2pkcs11.so -rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/libj2sctp.so -rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/libjaas_unix.so --rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/libjava.so -rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/libjava_crw_demo.so -rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/libjavajpeg.so -rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/libjavalcms.so +-rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/libjava.so lrwxrwxrwx root/root usr/lib/java/openjdk8/jre/lib/amd64/libjawt.so -> ../../../lib/amd64/libjawt.so -rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/libjdwp.so -rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/libjsdt.so -rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/libjsig.so --rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/libjsound.so -rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/libjsoundalsa.so +-rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/libjsound.so -rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/libmanagement.so -rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/libmlib_image.so -rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/libnet.so @@ -114,10 +113,10 @@ lrwxrwxrwx root/root usr/lib/java/openjdk8/jre/lib/amd64/libjawt.so -> ../../../ -rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/libverify.so -rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/libzip.so drwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/server/ --rw-r--r-- root/root usr/lib/java/openjdk8/jre/lib/amd64/server/Xusage.txt -r--r--r-- root/root usr/lib/java/openjdk8/jre/lib/amd64/server/classes.jsa lrwxrwxrwx root/root usr/lib/java/openjdk8/jre/lib/amd64/server/libjsig.so -> ../libjsig.so -rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/amd64/server/libjvm.so +-rw-r--r-- root/root usr/lib/java/openjdk8/jre/lib/amd64/server/Xusage.txt drwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/applet/ -rw-r--r-- root/root usr/lib/java/openjdk8/jre/lib/calendars.properties -rw-r--r-- root/root usr/lib/java/openjdk8/jre/lib/charsets.jar @@ -155,15 +154,15 @@ drwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/images/cursors/ -rw-r--r-- root/root usr/lib/java/openjdk8/jre/lib/images/cursors/motif_MoveNoDrop32x32.gif -rw-r--r-- root/root usr/lib/java/openjdk8/jre/lib/jce.jar -rwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/jexec --rw-r--r-- root/root usr/lib/java/openjdk8/jre/lib/jfr.jar drwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/jfr/ -rw-r--r-- root/root usr/lib/java/openjdk8/jre/lib/jfr/default.jfc +-rw-r--r-- root/root usr/lib/java/openjdk8/jre/lib/jfr.jar -rw-r--r-- root/root usr/lib/java/openjdk8/jre/lib/jfr/profile.jfc -rw-r--r-- root/root usr/lib/java/openjdk8/jre/lib/jsse.jar -rw-r--r-- root/root usr/lib/java/openjdk8/jre/lib/jvm.hprof.txt -rw-r--r-- root/root usr/lib/java/openjdk8/jre/lib/logging.properties --rw-r--r-- root/root usr/lib/java/openjdk8/jre/lib/management-agent.jar drwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/management/ +-rw-r--r-- root/root usr/lib/java/openjdk8/jre/lib/management-agent.jar -rw-r--r-- root/root usr/lib/java/openjdk8/jre/lib/management/jmxremote.access -r--r--r-- root/root usr/lib/java/openjdk8/jre/lib/management/jmxremote.password.template -rw-r--r-- root/root usr/lib/java/openjdk8/jre/lib/management/management.properties @@ -181,14 +180,14 @@ drwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/security/ -rw-r--r-- root/root usr/lib/java/openjdk8/jre/lib/security/nss.cfg drwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/security/policy/ drwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/security/policy/limited/ --rw-r--r-- root/root usr/lib/java/openjdk8/jre/lib/security/policy/limited/US_export_policy.jar -rw-r--r-- root/root usr/lib/java/openjdk8/jre/lib/security/policy/limited/local_policy.jar +-rw-r--r-- root/root usr/lib/java/openjdk8/jre/lib/security/policy/limited/US_export_policy.jar drwxr-xr-x root/root usr/lib/java/openjdk8/jre/lib/security/policy/unlimited/ --rw-r--r-- root/root usr/lib/java/openjdk8/jre/lib/security/policy/unlimited/US_export_policy.jar -rw-r--r-- root/root usr/lib/java/openjdk8/jre/lib/security/policy/unlimited/local_policy.jar +-rw-r--r-- root/root usr/lib/java/openjdk8/jre/lib/security/policy/unlimited/US_export_policy.jar -rw-r--r-- root/root usr/lib/java/openjdk8/jre/lib/sound.properties --rw-r--r-- root/root usr/lib/java/openjdk8/jre/lib/tz.properties -rw-r--r-- root/root usr/lib/java/openjdk8/jre/lib/tzdb.dat +-rw-r--r-- root/root usr/lib/java/openjdk8/jre/lib/tz.properties drwxr-xr-x root/root usr/lib/java/openjdk8/lib/ drwxr-xr-x root/root usr/lib/java/openjdk8/lib/amd64/ drwxr-xr-x root/root usr/lib/java/openjdk8/lib/amd64/jli/ diff --git a/openjdk8/.signature b/openjdk8/.signature index b1fb7842c..7878e2053 100644 --- a/openjdk8/.signature +++ b/openjdk8/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF31b3r7IJy/5LmxKuJP9fYcMHPRTREIk2pR1BDSlZZVzGenBOxBBS3wsrBI6XV52QBRrhwsMl8hC1qu5IGw2hjAI= -SHA256 (Pkgfile) = bae560e1cacd7aeac550c09695d9160ef64a7d1af5c93fb0aeee77d546be260b -SHA256 (.footprint) = b5b8d3b68f8c867337b3028d52fbcf2584dba33a02f9a6b97a6672a0a0cb343c +RWSagIOpLGJF34pTFDL3NugvSghyrYSN8o9mW4d2Ldpjb4JWn+pQnJp99W8IeGmM/s+EhHU5jiGM/HDC3yvN/bo2eXpDp7M3jgU= +SHA256 (Pkgfile) = f6f35d6389960889b6e634576f348c95f578655001ac224f97aad376a48a0410 +SHA256 (.footprint) = cd4e00a273c118ff620a64add01856801ec764c92707947de2001cae93ea5252 SHA256 (icedtea-3.19.0.tar.xz) = eed61e51ba35635b2292a6e67404d5e3f4bf7cc5d69bc1b81f5b69b1d8d1b5b2 SHA256 (corba-8u292-b10.tar.xz) = 19b87e02b27a7312fa0835660159bee55a9e8867fd0013dc36acc057dc331076 SHA256 (hotspot-8u292-b10.tar.xz) = a2417711339f3c1bb3b32612022e331fe090037b11ef98d989c1fab1acebcab9 diff --git a/openjdk8/Pkgfile b/openjdk8/Pkgfile index 09030c24e..2b298fa62 100644 --- a/openjdk8/Pkgfile +++ b/openjdk8/Pkgfile @@ -2,7 +2,8 @@ # URL: https://icedtea.classpath.org # Maintainer: Tim Biermann, tbier at posteo dot de # Co-Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: alsa-lib cups giflib gtk3 krb5 lcms2 libxslt nss p11-kit unzip xorg-libxcomposite xorg-libxinerama xorg-libxt zip +# Depends on: alsa-lib cups giflib gtk3 lcms2 libxslt nss p11-kit unzip xorg-libxcomposite xorg-libxinerama xorg-libxt zip +# Optional: krb5 name=openjdk8 version=8u292-b10 @@ -44,7 +45,7 @@ build() { # NOTE: the check for usr/bin/ccache may be too specific, since it rules out # local or opt installs. if [ -e '/usr/bin/ccache' ]; then - EXTRA_OPTIONS='--enable-ccache' + EXTRA_OPTIONS+='--enable-ccache' PATH=$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//') fi @@ -62,6 +63,8 @@ build() { mkdir $SRC/build cd $SRC/build + prt-get isinst krb5 && EXTRA_OPTIONS+=' --enable-system-kerberos' || EXTRA_OPTIONS+=' --disable-system-kerberos' + # Will fail if make-ca has not been run after p11-kit install LC_ALL=C \ CONFIG_SHELL=/bin/bash \ @@ -78,14 +81,8 @@ build() { --disable-systemtap-tests \ --disable-tests \ --enable-improved-font-rendering \ - --enable-non-nss-curves \ --enable-nss \ - --enable-system-cups \ - --enable-system-fontconfig \ - --enable-system-gio \ - --enable-system-gtk \ --enable-system-jpeg \ - --enable-system-kerberos \ --enable-system-lcms \ --enable-system-png \ --enable-system-zlib \