Add hardened flags #106731 and remove old snapshot

Package-Manager: portage-2.0.52-r1

diff --git a/app-emulation/xen/ChangeLog b/app-emulation/xen/ChangeLog
index accd6636370d8e015941dc6986cae6208abb3bde..0418f7d642de053cb03c49a5018c40529d02d1fd 100644 (file)
--- a/app-emulation/xen/ChangeLog
+++ b/app-emulation/xen/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/xen
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.3 2005/09/20 08:57:06 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.4 2005/09/22 22:18:34 chrb Exp $
+
+  22 Sep 2005; Chris Bainbridge <chrb@gentoo.org> xen-2.0.7.ebuild,
+  -xen-3.0.0_pre20050906.ebuild:
+  Add hardened flags #106731 and remove old snapshot
 
   20 Sep 2005; Chris Bainbridge <chrb@gentoo.org> files/xend-init,
   files/xendomains-init:

diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 9d81d9d9cf64fe329922f20138d1da0dcbd92aec..a6aa659f1d438056523c3770f713d7be5fd3069d 100644 (file)
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,12 +1,10 @@
-MD5 9f11061403afdd66c0c5052b6e1f232f ChangeLog 808
+MD5 30d6440c74dabddb9a2e81362cd79acc ChangeLog 963
 MD5 23ec60d5040f966fda250a47d8903428 metadata.xml 252
-MD5 127f02804f9b2029eff0f18830d17661 xen-2.0.7.ebuild 2696
-MD5 6bdec80c76754e7f3a07642ac527bcd0 xen-3.0.0_pre20050906.ebuild 2608
+MD5 b25e5ad259e28bab5d8d3b4c0a62d278 xen-2.0.7.ebuild 2853
 MD5 837501dd56f3c0ffb462217c550f74e2 xen-3.0.0_pre20050919.ebuild 2618
 MD5 16d372298e94a8eef72c1943b1ed5561 files/xend-conf 347
 MD5 4138fb645ecbd7a003e1bdb284c1b4ca files/xend-init 806
 MD5 9f441f0eaec0c4a04af82df233dadbe0 files/xendomains-conf 22
 MD5 d3326889a8fa0fe52d6f32f1f417fb8d files/xendomains-init 1261
-MD5 1d06bd45f1c44612f4ab57e8d7c303ac files/digest-xen-3.0.0_pre20050906 75
 MD5 7dc7b60a7e88657c9141d4154e41458c files/digest-xen-3.0.0_pre20050919 75
 MD5 6eaea330ed78459069eb5ba608e654dd files/digest-xen-2.0.7 63

diff --git a/app-emulation/xen/files/digest-xen-3.0.0_pre20050906 b/app-emulation/xen/files/digest-xen-3.0.0_pre20050906
deleted file mode 100644 (file)
index 62c9321..0000000
--- a/app-emulation/xen/files/digest-xen-3.0.0_pre20050906
+++ /dev/null
@@ -1 +0,0 @@
-MD5 275268323779cf0a918393272bf84cb0 xen-unstable-20050906.tar.bz2 3413981

diff --git a/app-emulation/xen/xen-2.0.7.ebuild b/app-emulation/xen/xen-2.0.7.ebuild
index 8cba761966eb9595a1bb1fa55713ce5f3273d38c..8fa759abe6d49808db2adefadcdf3fdcd2192090 100644 (file)
--- a/app-emulation/xen/xen-2.0.7.ebuild
+++ b/app-emulation/xen/xen-2.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-2.0.7.ebuild,v 1.2 2005/09/08 23:01:22 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-2.0.7.ebuild,v 1.3 2005/09/22 22:18:34 chrb Exp $
 
 inherit mount-boot
 
@@ -26,6 +26,13 @@ DEPEND="sys-apps/iproute2
 
 S="${WORKDIR}/${PN}-2.0"
 
+src_unpack() {
+       unpack ${A}
+       # hardened flags
+       echo "CFLAGS += -nopie -fno-stack-protector -fno-stack-protector-all" \
+           >> ${S}/xen/arch/x86/Rules.mk
+}
+
 src_compile() {
        local myopt
        if use debug; then

diff --git a/app-emulation/xen/xen-3.0.0_pre20050906.ebuild b/app-emulation/xen/xen-3.0.0_pre20050906.ebuild
deleted file mode 100644 (file)
index 2196694..0000000
--- a/app-emulation/xen/xen-3.0.0_pre20050906.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.0.0_pre20050906.ebuild,v 1.1 2005/09/07 18:18:59 chrb Exp $
-
-inherit mount-boot
-
-DESCRIPTION="The Xen virtual machine monitor and Xend daemon"
-HOMEPAGE="http://xen.sourceforge.net"
-DATE="20050906"
-SRC_URI="mirror://gentoo/xen-unstable-${DATE}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="doc debug"
-
-DEPEND="sys-apps/iproute2
-       net-misc/bridge-utils
-       dev-lang/python
-       net-misc/curl
-       sys-libs/zlib
-       doc? (
-               dev-tex/latex2html
-               media-gfx/transfig
-       )"
-
-S="${WORKDIR}/xen-unstable-${DATE}"
-
-src_compile() {
-       local myopt
-       if use debug; then
-               myopt="${myopt} debug=y"
-       fi
-
-       unset CFLAGS
-       make ${myopt} -C xen || die "compiling xen failed"
-       make ${myopt} -C tools || die "compiling tools failed"
-
-       if use doc; then
-               sh ./docs/check_pkgs || die "package check failed"
-               make ${myopt} -C docs || die "compiling docs failed"
-       fi
-
-}
-
-src_install() {
-       make DESTDIR=${D} -C xen install || die "installing xen failed"
-
-       make DESTDIR=${D} XEN_PYTHON_NATIVE_INSTALL=1 -C tools install \
-           || die "installing tools failed"
-
-       if use doc; then
-               make DESTDIR=${D} -C docs install \
-                       || die "installing docs failed"
-               # Rename doc/xen to the Gentoo-style doc/xen-x.y
-               mv ${D}/usr/share/doc/{${PN},${PF}}
-       fi
-
-       # bind xend to localhost per default
-       sed -i -e "s/\((xend-address  *\)'')/\1\'localhost\')/" \
-               ${D}/etc/xen/xend-config.sxp
-
-       newinitd ${FILESDIR}/xend-init xend
-       newconfd ${FILESDIR}/xend-conf xend
-       newconfd ${FILESDIR}/xendomains-conf xendomains
-       newinitd ${FILESDIR}/xendomains-init xendomains
-
-       # install kernel source patches
-       dodir /usr/share/xen/patches
-       rm patches/linux-2.6.12/patch-2.6.12.5
-       cd patches
-       for x in *; do tar -jcvf ${D}/usr/share/xen/patches/${x}.tar.bz2 ${x}/; done
-       cd ..
-
-       # we need to do whatever mkbuildtree would've done for each platform
-       # linux-2.6: copy public include files, and xenstored.h
-       mkdir linux-2.6-xen-sparse/include/asm-xen/xen-public
-       rm xen/include/public/COPYING
-       cp -dpPR xen/include/public/* linux-2.6-xen-sparse/include/asm-xen/xen-public
-       cp -dpP tools/xenstore/xenstored.h linux-2.6-xen-sparse/drivers/xen/xenbus
-       # fixme: insert code for other sparse trees here
-
-       # install xen kernel sparse trees
-       for x in *-xen-sparse; do
-           if [ -e ${x}/mkbuildtree ]; then rm ${x}/mkbuildtree; fi
-           tar -jcvf ${D}/usr/share/xen/${x}.tar.bz2 -C ${x} .
-       done
-
-}
-
-pkg_postinst() {
-       einfo "Please visit the Xen and Gentoo wiki:"
-       einfo "http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo"
-}