sera 14/07/21 00:07:03
Modified: ChangeLog oracle-jre-bin-1.8.0.11.ebuild
oracle-jre-bin-1.7.0.65.ebuild
Log:
Fix install with missing xattr support #517626
Fix selinux support #515582
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
3C5CF75A)
Revision Changes Path
1.60 dev-java/oracle-jre-bin/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog?rev=1.60&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog?rev=1.60&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog?r1=1.59&r2=1.60
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- ChangeLog 20 Jul 2014 20:36:57 -0000 1.59
+++ ChangeLog 21 Jul 2014 00:07:03 -0000 1.60
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/oracle-jre-bin
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.59
2014/07/20 20:36:57 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.60
2014/07/21 00:07:03 sera Exp $
+
+ 21 Jul 2014; Ralph Sennhauser <[email protected]>
+ oracle-jre-bin-1.7.0.65.ebuild, oracle-jre-bin-1.8.0.11.ebuild:
+ Fix install with missing xattr support #517626
+ Fix selinux support #515582
*oracle-jre-bin-1.8.0.11 (20 Jul 2014)
1.2 dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.11.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.11.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.11.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.11.ebuild?r1=1.1&r2=1.2
Index: oracle-jre-bin-1.8.0.11.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.11.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- oracle-jre-bin-1.8.0.11.ebuild 20 Jul 2014 20:36:57 -0000 1.1
+++ oracle-jre-bin-1.8.0.11.ebuild 21 Jul 2014 00:07:03 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.11.ebuild,v
1.1 2014/07/20 20:36:57 sera Exp $
+# $Header:
/var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.11.ebuild,v
1.2 2014/07/21 00:07:03 sera Exp $
EAPI="5"
@@ -35,12 +35,14 @@
LICENSE="Oracle-BCLA-JavaSE"
SLOT="1.8"
KEYWORDS="~amd64 ~x86"
-IUSE="X alsa fontconfig jce nsplugin pax_kernel"
+IUSE="X alsa fontconfig jce nsplugin pax_kernel selinux"
RESTRICT="fetch strip"
QA_PREBUILT="*"
-RDEPEND="
+COMMON_DEP="
+ selinux? ( sec-policy/selinux-java )"
+RDEPEND="${COMMON_DEP}
X? (
x11-libs/libXext
x11-libs/libXi
@@ -53,7 +55,7 @@
!prefix? ( sys-libs/glibc )"
# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
# marking. #427642
-DEPEND="
+DEPEND="${COMMON_DEP}
jce? ( app-arch/unzip )
pax_kernel? ( sys-apps/paxctl )"
@@ -92,36 +94,14 @@
fi
}
-src_compile() {
- # This needs to be done before CDS - #215225
- java-vm_set-pax-markings "${S}"
-
- # see bug #207282
- einfo "Creating the Class Data Sharing archives"
- case ${ARCH} in
- arm|ia64)
- bin/java -client -Xshare:dump || die
- ;;
- x86)
- bin/java -client -Xshare:dump || die
- # limit heap size for large memory on x86 #467518
- # this is a workaround and shouldn't be needed.
- bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
- ;;
- *)
- bin/java -server -Xshare:dump || die
- ;;
- esac
+src_install() {
+ local dest="/opt/${P}"
+ local ddest="${ED}${dest}"
# Create files used as storage for system preferences.
mkdir .systemPrefs || die
touch .systemPrefs/.system.lock || die
touch .systemPrefs/.systemRootModFile || die
-}
-
-src_install() {
- local dest="/opt/${P}"
- local ddest="${ED}${dest}"
# We should not need the ancient plugin for Firefox 2 anymore, plus it
has
# writable executable segments
@@ -139,9 +119,27 @@
fi
dodir "${dest}"
- cp -R --preserve=links,mode,ownership,timestamps,xattr \
- bin lib man "${ddest}" || die
+ cp -pPR bin lib man "${ddest}" || die
+ # This needs to be done before CDS - #215225
+ java-vm_set-pax-markings "${ddest}"
+
+ # see bug #207282
+ einfo "Creating the Class Data Sharing archives"
+ case ${ARCH} in
+ arm|ia64)
+ ${ddest}/bin/java -client -Xshare:dump || die
+ ;;
+ x86)
+ ${ddest}/bin/java -client -Xshare:dump || die
+ # limit heap size for large memory on x86 #467518
+ # this is a workaround and shouldn't be needed.
+ ${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump
|| die
+ ;;
+ *)
+ ${ddest}/bin/java -server -Xshare:dump || die
+ ;;
+ esac
# Remove empty dirs we might have copied
find "${D}" -type d -empty -exec rmdir -v {} + || die
1.2 dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.65.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.65.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.65.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.65.ebuild?r1=1.1&r2=1.2
Index: oracle-jre-bin-1.7.0.65.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.65.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- oracle-jre-bin-1.7.0.65.ebuild 20 Jul 2014 20:07:15 -0000 1.1
+++ oracle-jre-bin-1.7.0.65.ebuild 21 Jul 2014 00:07:03 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.65.ebuild,v
1.1 2014/07/20 20:07:15 sera Exp $
+# $Header:
/var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.65.ebuild,v
1.2 2014/07/21 00:07:03 sera Exp $
EAPI="5"
@@ -29,12 +29,14 @@
LICENSE="Oracle-BCLA-JavaSE"
SLOT="1.7"
KEYWORDS="~amd64 ~x86"
-IUSE="X alsa fontconfig jce nsplugin pax_kernel"
+IUSE="X alsa fontconfig jce nsplugin pax_kernel selinux"
RESTRICT="fetch strip"
QA_PREBUILT="*"
-RDEPEND="
+COMMON_DEP="
+ selinux? ( sec-policy/selinux-java )"
+RDEPEND="${COMMON_DEP}
X? (
x11-libs/libXext
x11-libs/libXi
@@ -47,7 +49,7 @@
!prefix? ( sys-libs/glibc )"
# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
# marking. #427642
-DEPEND="
+DEPEND="${COMMON_DEP}
jce? ( app-arch/unzip )
pax_kernel? ( sys-apps/paxctl )"
@@ -77,36 +79,14 @@
fi
}
-src_compile() {
- # This needs to be done before CDS - #215225
- java-vm_set-pax-markings "${S}"
-
- # see bug #207282
- einfo "Creating the Class Data Sharing archives"
- case ${ARCH} in
- arm|ia64)
- bin/java -client -Xshare:dump || die
- ;;
- x86)
- bin/java -client -Xshare:dump || die
- # limit heap size for large memory on x86 #467518
- # this is a workaround and shouldn't be needed.
- bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
- ;;
- *)
- bin/java -server -Xshare:dump || die
- ;;
- esac
+src_install() {
+ local dest="/opt/${P}"
+ local ddest="${ED}${dest}"
# Create files used as storage for system preferences.
mkdir .systemPrefs || die
touch .systemPrefs/.system.lock || die
touch .systemPrefs/.systemRootModFile || die
-}
-
-src_install() {
- local dest="/opt/${P}"
- local ddest="${ED}${dest}"
# We should not need the ancient plugin for Firefox 2 anymore, plus it
has
# writable executable segments
@@ -124,8 +104,27 @@
fi
dodir "${dest}"
- cp -R --preserve=links,mode,ownership,timestamps,xattr \
- bin lib man "${ddest}" || die
+ cp -pPR bin lib man "${ddest}" || die
+
+ # This needs to be done before CDS - #215225
+ java-vm_set-pax-markings "${ddest}"
+
+ # see bug #207282
+ einfo "Creating the Class Data Sharing archives"
+ case ${ARCH} in
+ arm|ia64)
+ ${ddest}/bin/java -client -Xshare:dump || die
+ ;;
+ x86)
+ ${ddest}/bin/java -client -Xshare:dump || die
+ # limit heap size for large memory on x86 #467518
+ # this is a workaround and shouldn't be needed.
+ ${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump
|| die
+ ;;
+ *)
+ ${ddest}/bin/java -server -Xshare:dump || die
+ ;;
+ esac
# Remove empty dirs we might have copied
find "${D}" -type d -empty -exec rmdir -v {} + || die
