From 2445181bde50a83976dc1bd1a4bf7248b88122f9 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Tue, 24 Sep 2013 01:55:28 +0000 Subject: [PATCH] extra/java7-openjdk to 7.u40_2.4.2-1 --- extra/java7-openjdk/PKGBUILD | 110 ++++++++++++++++++----------------- 1 file changed, 57 insertions(+), 53 deletions(-) diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 5a301e318..2490f0731 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -12,27 +12,26 @@ noautobuild=1 -pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' - 'openjdk7-src') +pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src') pkgbase=java7-openjdk _java_ver=7 _updatever=u40 -_icedtea_ver=2.4.1 +_icedtea_ver=2.4.2 # check "${srcdir}/icedtea-${_icedtea_ver}"/Makefile.am -_CORBA_CHANGESET=23ae4e0e0cce -_JAXP_CHANGESET=5be6b670d08b -_JAXWS_CHANGESET=c0e48fdfb695 -_JDK_CHANGESET=65d95818d79e -_LANGTOOLS_CHANGESET=91c95fd8eea8 -_OPENJDK_CHANGESET=ae86c6974e8e +_CORBA_CHANGESET=5ea58899ae9f +_JAXP_CHANGESET=135f46e0e653 +_JAXWS_CHANGESET=a2ff16e5361f +_JDK_CHANGESET=4bf5ac86e0e4 +_LANGTOOLS_CHANGESET=06ea051f7ffe +_OPENJDK_CHANGESET=6125b83238df -_HOTSPOT_CHANGESET=5f53e7717116 # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map +_HOTSPOT_CHANGESET=b732355257e3 # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map _bootstrap=0 # 0/1 for quick build or full bootstrap pkgver=${_java_ver}.${_updatever}_${_icedtea_ver} -pkgrel=3 +pkgrel=1 arch=('i686' 'x86_64') url="http://icedtea.classpath.org" license=('custom') @@ -58,14 +57,14 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar jdk7-openjdk.profile.csh jre7-openjdk.profile jre7-openjdk.profile.csh) -sha256sums=('65142e19ee14c28106345b30b6181f5a4926dd20be599c536d778e31a8a5812a' - 'f9f2925af3eac91ec4b0389b5316f840239558048569db2193b9e2ae34ffe32a' - '618bb237f262a4a703edb88bd873fd80fe33d7fb07b8a113bfc701227b748395' - 'df2d15089890a7565b0dd89f867d7b2931839652d29029d63f8201358b0ecd34' - '972de06b968a6da85b1d9216c5617325135fc63c90ffb5e1d7721dce5843b037' - '97edcd78d316f33a43278c5549cb58a06f67305b63ad51b7c1a1fca7c45c6432' - '6ff5cdcca8184526a5928bb8ff0bcc38b897d463559cc9f2b10e439931a8f561' - 'f2cfd6da6ff85dff4e6f5d40e21bc48cf15325bcd69d6c36e8f27e1fca74bd42' +sha256sums=('3dab1edc5c0391bd67cfac60cbfb5c91aee6ea9726043252d9f216dfafd236b6' + 'bc5703a7c31a6f1de53259768f613fa1f451d721d3301c58a59513dc3953d95b' + '41fc9041d7804bbd519290325c0a21b48405ed96ccf557037189b007391d33a8' + '3e043ea822cf18232fb0897431a2c900c8d29dce59e33bd8e3236ed1ac6c8fde' + 'ac21931af93267188fb6dac8ed5eb44121e25e55fe432c19184c20c17cc9ceda' + '8cc46ef5d73a3a6445b411637fee5cc5f086e400d42b36f1f42eba4caee2a11a' + 'd2de1d2e98ebea56d2367f0003e5f4b5031d55ed529a7c524df8eba9da08c735' + '4a4a04fa2c49d0a688400f6c9f129f47ba5cd931874c33254a047a1f36e6ac36' '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' 'fd615f476ef17853ae55b7aee3c92b6738f9ea584e915749b1caa7fdc5ff9ca4' 'bd55299e08e6f8e61ba5baad0990170891801a29a1e8137e502b5e8a10fc37ea' @@ -174,8 +173,8 @@ package_jre7-openjdk-headless() { rm -f lib/fontconfig.*.properties.src rm -f lib/fontconfig.properties.src - install -d -m755 ${pkgdir}/${_jvmdir}/jre/ - cp -a bin lib ${pkgdir}/${_jvmdir}/jre + install -d -m755 ${pkgdir}${_jvmdir}/jre + cp -a bin lib ${pkgdir}${_jvmdir}/jre # Install man pages pushd ../../j2re-image/man @@ -187,22 +186,22 @@ package_jre7-openjdk-headless() { # more files that belong to the desktop package mkdir ${srcdir}/tmp-desktop-jre for file in \ - "/usr/lib/jvm/java-7-openjdk/jre/bin/policytool" \ - "/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/libjsoundalsa.so" \ - "/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/libpulse-java.so" \ - "/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/libsplashscreen.so" \ - "/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/xawt/libmawt.so" \ - "/usr/share/man/ja/man1/policytool.1" \ - "/usr/share/man/man1/policytool.1"; do + "${_jvmdir}/jre/bin/policytool" \ + "${_jvmdir}/jre/lib/${_JARCH}/libjsoundalsa.so" \ + "${_jvmdir}/jre/lib/${_JARCH}/libpulse-java.so" \ + "${_jvmdir}/jre/lib/${_JARCH}/libsplashscreen.so" \ + "${_jvmdir}/jre/lib/${_JARCH}/xawt/libmawt.so" \ + "/usr/share/man/ja/man1/policytool.1" \ + "/usr/share/man/man1/policytool.1"; do dirname=`dirname $file` install -dm755 ${srcdir}/tmp-desktop-jre/$dirname || /bin/true # mv file from fakeinstall to pkgdir mv ${pkgdir}/$file ${srcdir}/tmp-desktop-jre$file done - rmdir ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/xawt + rmdir ${pkgdir}${_jvmdir}/jre/lib/${_JARCH}/xawt # Link binaries into /usr/bin - pushd ${pkgdir}/${_jvmdir}/jre/bin + pushd ${pkgdir}${_jvmdir}/jre/bin install -m755 -d ${pkgdir}/usr/bin/ for file in *; do ln -sf ${_jvmdir}/jre/bin/${file} ${pkgdir}/usr/bin @@ -210,8 +209,8 @@ package_jre7-openjdk-headless() { popd # Link JKS keystore from ca-certificates-java - rm -f ${pkgdir}/${_jvmdir}/jre/lib/security/cacerts - ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}/${_jvmdir}/jre/lib/security/cacerts" + rm -f ${pkgdir}${_jvmdir}/jre/lib/security/cacerts + ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/jre/lib/security/cacerts" # Set some variables install -m755 -d ${pkgdir}/etc/profile.d/ @@ -228,31 +227,36 @@ package_jre7-openjdk-headless() { # Put some more files under backup control install -m755 -d ${pkgdir}/etc/java-7-openjdk/ - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/*.properties* ${pkgdir}/etc/java-7-openjdk/ + install -m644 ${pkgdir}${_jvmdir}/jre/lib/*.properties* ${pkgdir}/etc/java-7-openjdk/ # install dummy links to make them found by JAVA - cd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/ + cd ${pkgdir}${_jvmdir}/jre/lib/ for file in `ls ${pkgdir}/etc/java-7-openjdk/*.properties*`; do ln -vsf /etc/java-7-openjdk/`basename $file` . done # some more install -m755 -d ${pkgdir}/etc/java-7-openjdk/{cursors,management,security} - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/images/cursors/cursors.properties ${pkgdir}/etc/java-7-openjdk/cursors/ - pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/images/cursors/ + install -m644 ${pkgdir}${_jvmdir}/jre/lib/images/cursors/cursors.properties \ + ${pkgdir}/etc/java-7-openjdk/cursors/ + pushd ${pkgdir}${_jvmdir}/jre/lib/images/cursors/ ln -vsf /etc/java-7-openjdk/cursors/cursors.properties . popd - mv ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/jmxremote.password.template ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/jmxremote.password - mv ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/snmp.acl.template ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/snmp.acl - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/{management.properties,jmxremote.access,jmxremote.password,snmp.acl} ${pkgdir}/etc/java-7-openjdk/management/ - pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management + mv ${pkgdir}${_jvmdir}/jre/lib/management/jmxremote.password.template \ + ${pkgdir}${_jvmdir}/jre/lib/management/jmxremote.password + mv ${pkgdir}${_jvmdir}/jre/lib/management/snmp.acl.template \ + ${pkgdir}${_jvmdir}/jre/lib/management/snmp.acl + install -m644 ${pkgdir}${_jvmdir}/jre/lib/management/{management.properties,jmxremote.access,jmxremote.password,snmp.acl} \ + ${pkgdir}/etc/java-7-openjdk/management/ + pushd ${pkgdir}${_jvmdir}/jre/lib/management ln -vsf /etc/java-7-openjdk/management/{management.properties,jmxremote.access,jmxremote.password,snmp.acl} . popd - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/security/{java.policy,java.security,nss.cfg} ${pkgdir}/etc/java-7-openjdk/security/ - pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/security + install -m644 ${pkgdir}${_jvmdir}/jre/lib/security/{java.policy,java.security,nss.cfg} \ + ${pkgdir}/etc/java-7-openjdk/security/ + pushd ${pkgdir}${_jvmdir}/jre/lib/security ln -vsf /etc/java-7-openjdk/security/{java.policy,java.security,nss.cfg} . popd - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/fontconfig.bfc ${pkgdir}/etc/java-7-openjdk/ - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/jvm.cfg ${pkgdir}/etc/java-7-openjdk/ - pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/ + install -m644 ${pkgdir}${_jvmdir}/jre/lib/fontconfig.bfc ${pkgdir}/etc/java-7-openjdk/ + install -m644 ${pkgdir}${_jvmdir}/jre/lib/${_JARCH}/jvm.cfg ${pkgdir}/etc/java-7-openjdk/ + pushd ${pkgdir}${_jvmdir}/jre/lib/${_JARCH}/ ln -vsf /etc/java-7-openjdk/jvm.cfg . popd } @@ -272,7 +276,7 @@ package_jre7-openjdk() { mv ${srcdir}/tmp-desktop-jre/* ${pkgdir} # Link binaries into /usr/bin - pushd ${pkgdir}/${_jvmdir}/jre/bin + pushd ${pkgdir}${_jvmdir}/jre/bin install -m755 -d ${pkgdir}/usr/bin/ for file in *; do ln -sf ${_jvmdir}/jre/bin/${file} ${pkgdir}/usr/bin @@ -308,13 +312,13 @@ package_jdk7-openjdk() { cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image" # Main files - install -m755 -d ${pkgdir}/${_jvmdir}/ + install -m755 -d ${pkgdir}${_jvmdir} - cp -a include lib ${pkgdir}/${_jvmdir} + cp -a include lib ${pkgdir}${_jvmdir} # 'bin' files pushd bin - install -m755 -d ${pkgdir}/${_jvmdir}/bin/ \ + install -m755 -d ${pkgdir}${_jvmdir}/bin/ \ ${pkgdir}/usr/bin/ \ ${pkgdir}/usr/share/man/{,ja/}man1/ @@ -322,10 +326,10 @@ package_jdk7-openjdk() { for b in $(ls | grep -v java-rmi.cgi); do if [ -e ../jre/bin/${b} ]; then # Provide a link of the jre binary in the jdk/bin/ directory - ln -s ../jre/bin/${b} ${pkgdir}/${_jvmdir}/bin/${b} + ln -s ../jre/bin/${b} ${pkgdir}${_jvmdir}/bin/${b} else # Copy binary to jdk/bin/ - install -m755 ${b} ${pkgdir}/${_jvmdir}/bin/${b} + install -m755 ${b} ${pkgdir}${_jvmdir}/bin/${b} # Copy man page install -m644 ../man/man1/${b}.1 ${pkgdir}/usr/share/man/man1/${b}.1 install -m644 ../man/ja/man1/${b}.1 ${pkgdir}/usr/share/man/ja/man1/${b}.1 @@ -340,7 +344,7 @@ package_jdk7-openjdk() { install -m644 ${srcdir}/icedtea-${_icedtea_ver}/jconsole.desktop ${pkgdir}/usr/share/applications # Handling 'java-rmi.cgi' separately - install -m755 -D bin/java-rmi.cgi ${pkgdir}/${_jvmdir}/bin/java-rmi.cgi + install -m755 -D bin/java-rmi.cgi ${pkgdir}${_jvmdir}/bin/java-rmi.cgi # Set some variables install -m755 -d ${pkgdir}/etc/profile.d/ @@ -357,5 +361,5 @@ package_openjdk7-src() { replaces=('openjdk6-src') install -D ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/src.zip \ - ${pkgdir}/${_jvmdir}/src.zip + ${pkgdir}${_jvmdir}/src.zip }