dlan 15/03/28 13:25:43 Modified: xen-4.2.5-r7.ebuild ChangeLog xen-4.5.0-r4.ebuild Added: xen-4.4.2.ebuild Removed: xen-4.3.3-r8.ebuild Log: drop 4.3.x, bump 4.4.2, prepare security patch setting (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0xAABEFD55)
Revision Changes Path 1.2 app-emulation/xen/xen-4.2.5-r7.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.2.5-r7.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.2.5-r7.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.2.5-r7.ebuild?r1=1.1&r2=1.2 Index: xen-4.2.5-r7.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.5-r7.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xen-4.2.5-r7.ebuild 14 Mar 2015 12:31:07 -0000 1.1 +++ xen-4.2.5-r7.ebuild 28 Mar 2015 13:25:42 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.5-r7.ebuild,v 1.1 2015/03/14 12:31:07 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.5-r7.ebuild,v 1.2 2015/03/28 13:25:42 dlan Exp $ EAPI=5 @@ -15,14 +15,18 @@ else KEYWORDS="~amd64 ~x86" UPSTREAM_VER=6 + SECURITY_VER= GENTOO_VER= [[ -n ${UPSTREAM_VER} ]] && \ UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"; + [[ -n ${SECURITY_VER} ]] && \ + SECURITY_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"; [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"; + GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"; SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz ${UPSTREAM_PATCHSET_URI} + ${SECURITY_PATCHSET_URI} ${GENTOO_PATCHSET_URI}" fi @@ -80,6 +84,14 @@ epatch "${WORKDIR}"/patches-upstream fi + # Security patchset + if [[ -n ${SECURITY_VER} ]]; then + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + EPATCH_OPTS="-p1" \ + epatch "${WORKDIR}/patches-security/${PV}" + fi + # Gentoo's patchset if [[ -n ${GENTOO_VER} ]]; then EPATCH_SUFFIX="patch" \ 1.194 app-emulation/xen/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/ChangeLog?rev=1.194&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/ChangeLog?rev=1.194&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/ChangeLog?r1=1.193&r2=1.194 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v retrieving revision 1.193 retrieving revision 1.194 diff -u -r1.193 -r1.194 --- ChangeLog 14 Mar 2015 12:31:07 -0000 1.193 +++ ChangeLog 28 Mar 2015 13:25:42 -0000 1.194 @@ -1,6 +1,12 @@ # ChangeLog for app-emulation/xen # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.193 2015/03/14 12:31:07 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.194 2015/03/28 13:25:42 dlan Exp $ + +*xen-4.4.2 (28 Mar 2015) + + 28 Mar 2015; Yixun Lan <[email protected]> xen-4.2.5-r7.ebuild, + -xen-4.3.3-r8.ebuild, +xen-4.4.2.ebuild, xen-4.5.0-r4.ebuild: + drop 4.3.x, bump 4.4.2, prepare security patch setting *xen-4.5.0-r4 (14 Mar 2015) *xen-4.4.1-r9 (14 Mar 2015) 1.2 app-emulation/xen/xen-4.5.0-r4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.5.0-r4.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.5.0-r4.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.5.0-r4.ebuild?r1=1.1&r2=1.2 Index: xen-4.5.0-r4.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.5.0-r4.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xen-4.5.0-r4.ebuild 14 Mar 2015 12:31:07 -0000 1.1 +++ xen-4.5.0-r4.ebuild 28 Mar 2015 13:25:42 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.5.0-r4.ebuild,v 1.1 2015/03/14 12:31:07 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.5.0-r4.ebuild,v 1.2 2015/03/28 13:25:42 dlan Exp $ EAPI=5 @@ -16,14 +16,18 @@ else KEYWORDS="~arm ~arm64 ~amd64" UPSTREAM_VER=3 + SECURITY_VER= GENTOO_VER= [[ -n ${UPSTREAM_VER} ]] && \ UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"; + [[ -n ${SECURITY_VER} ]] && \ + SECURITY_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"; [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"; + GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"; SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz ${UPSTREAM_PATCHSET_URI} + ${SECURITY_PATCHSET_URI} ${GENTOO_PATCHSET_URI}" fi @@ -87,6 +91,14 @@ epatch "${WORKDIR}"/patches-upstream fi + # Security patchset + if [[ -n ${SECURITY_VER} ]]; then + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + EPATCH_OPTS="-p1" \ + epatch "${WORKDIR}/patches-security/${PV}" + fi + # Gentoo's patchset if [[ -n ${GENTOO_VER} ]]; then EPATCH_SUFFIX="patch" \ 1.1 app-emulation/xen/xen-4.4.2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.4.2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/xen-4.4.2.ebuild?rev=1.1&content-type=text/plain Index: xen-4.4.2.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.4.2.ebuild,v 1.1 2015/03/28 13:25:42 dlan Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) MY_PV=${PV/_/-} MY_P=${PN}-${PV/_/-} if [[ $PV == *9999 ]]; then KEYWORDS="" EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git" live_eclass="git-2" else KEYWORDS="~amd64 ~arm -x86" UPSTREAM_VER= SECURITY_VER= GENTOO_VER= [[ -n ${UPSTREAM_VER} ]] && \ UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"; [[ -n ${SECURITY_VER} ]] && \ SECURITY_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"; [[ -n ${GENTOO_VER} ]] && \ GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"; SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz ${UPSTREAM_PATCHSET_URI} ${SECURITY_PATCHSET_URI} ${GENTOO_PATCHSET_URI}" fi inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass} DESCRIPTION="The Xen virtual machine monitor" HOMEPAGE="http://xen.org/"; LICENSE="GPL-2" SLOT="0" IUSE="custom-cflags debug efi flask xsm" DEPEND="${PYTHON_DEPS} efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22[-multitarget] )" RDEPEND="" PDEPEND="~app-emulation/xen-tools-${PV}" RESTRICT="test" # Approved by QA team in bug #144032 QA_WX_LOAD="boot/xen-syms-${PV}" REQUIRED_USE="flask? ( xsm ) arm? ( debug )" S="${WORKDIR}/${MY_P}" pkg_setup() { python-any-r1_pkg_setup if [[ -z ${XEN_TARGET_ARCH} ]]; then if use x86 && use amd64; then die "Confusion! Both x86 and amd64 are set in your use flags!" elif use x86; then export XEN_TARGET_ARCH="x86_32" elif use amd64; then export XEN_TARGET_ARCH="x86_64" elif use arm; then export XEN_TARGET_ARCH="arm32" else die "Unsupported architecture!" fi fi if use flask ; then export "XSM_ENABLE=y" export "FLASK_ENABLE=y" elif use xsm ; then export "XSM_ENABLE=y" fi } src_prepare() { # Upstream's patchset if [[ -n ${UPSTREAM_VER} ]]; then EPATCH_SUFFIX="patch" \ EPATCH_FORCE="yes" \ EPATCH_OPTS="-p1" \ epatch "${WORKDIR}"/patches-upstream fi # Security patchset if [[ -n ${SECURITY_VER} ]]; then EPATCH_SUFFIX="patch" \ EPATCH_FORCE="yes" \ EPATCH_OPTS="-p1" \ epatch "${WORKDIR}/patches-security/${PV}" fi # Gentoo's patchset if [[ -n ${GENTOO_VER} ]]; then EPATCH_SUFFIX="patch" \ EPATCH_FORCE="yes" \ epatch "${WORKDIR}"/patches-gentoo fi # Drop .config sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" if use efi; then epatch "${FILESDIR}"/${PN}-4.4-efi.patch export EFI_VENDOR="gentoo" export EFI_MOUNTPOINT="boot" fi # if the user *really* wants to use their own custom-cflags, let them if use custom-cflags; then einfo "User wants their own CFLAGS - removing defaults" # try and remove all the default custom-cflags find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ -i {} \; || die "failed to re-set custom-cflags" fi # remove -Werror for gcc-4.6's sake find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \ xargs sed -i 's/ *-Werror */ /' # not strictly necessary to fix this sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py" epatch_user } src_configure() { use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i" use debug && myopt="${myopt} debug=y" if use custom-cflags; then filter-flags -fPIE -fstack-protector replace-flags -O3 -O2 else unset CFLAGS fi } src_compile() { # Send raw LDFLAGS so that --as-needed works emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt} } src_install() { local myopt use debug && myopt="${myopt} debug=y" # The 'make install' doesn't 'mkdir -p' the subdirs if use efi; then mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die fi emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install } pkg_postinst() { elog "Official Xen Guide and the unoffical wiki page:" elog " https://wiki.gentoo.org/wiki/Xen"; elog " http://en.gentoo-wiki.com/wiki/Xen/"; use efi && einfo "The efi executable is installed in boot/efi/gentoo" }
