| 1 |
idella4 13/05/20 14:15:45 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: xen-pvgrub-4.2.1-r2.ebuild xen-pvgrub-4.2.2.ebuild |
| 5 |
Log: |
| 6 |
rebump with sec. pathces, ditto bump |
| 7 |
|
| 8 |
(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.24 app-emulation/xen-pvgrub/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-pvgrub/ChangeLog?rev=1.24&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-pvgrub/ChangeLog?rev=1.24&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-pvgrub/ChangeLog?r1=1.23&r2=1.24 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/ChangeLog,v |
| 20 |
retrieving revision 1.23 |
| 21 |
retrieving revision 1.24 |
| 22 |
diff -u -r1.23 -r1.24 |
| 23 |
--- ChangeLog 19 Feb 2013 20:20:56 -0000 1.23 |
| 24 |
+++ ChangeLog 20 May 2013 14:15:45 -0000 1.24 |
| 25 |
@@ -1,6 +1,19 @@ |
| 26 |
# ChangeLog for app-emulation/xen-pvgrub |
| 27 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/ChangeLog,v 1.23 2013/02/19 20:20:56 idella4 Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/ChangeLog,v 1.24 2013/05/20 14:15:45 idella4 Exp $ |
| 30 |
+ |
| 31 |
+*xen-pvgrub-4.2.1-r2 (20 May 2013) |
| 32 |
+*xen-pvgrub-4.2.2 (20 May 2013) |
| 33 |
+ |
| 34 |
+ 20 May 2013; Ian Delaney <idella4@g.o> |
| 35 |
+ +files/xen-4-CVE-2013-0215-XSA-38.patch, |
| 36 |
+ +files/xen-4-CVE-2013-1919-XSA-46.patch, |
| 37 |
+ +files/xen-4-CVE-2013-1922-XSA-48.patch, |
| 38 |
+ +files/xen-4-CVE-2013-1952-XSA-49.patch, |
| 39 |
+ +files/xen-4-CVE-2013-1952-XSA_49.patch, +xen-pvgrub-4.2.1-r2.ebuild, |
| 40 |
+ +xen-pvgrub-4.2.2.ebuild, xen-pvgrub-4.2.0-r1.ebuild, |
| 41 |
+ xen-pvgrub-4.2.1-r1.ebuild: |
| 42 |
+ rebump with sec. pathces, ditto bump |
| 43 |
|
| 44 |
19 Feb 2013; Ian Delaney <idella4@g.o> -files/xen-4.2.1-CC.patch, |
| 45 |
files/xen-4.2.1-externals.patch, xen-pvgrub-4.2.1-r1.ebuild: |
| 46 |
|
| 47 |
|
| 48 |
|
| 49 |
1.1 app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r2.ebuild |
| 50 |
|
| 51 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r2.ebuild?rev=1.1&view=markup |
| 52 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r2.ebuild?rev=1.1&content-type=text/plain |
| 53 |
|
| 54 |
Index: xen-pvgrub-4.2.1-r2.ebuild |
| 55 |
=================================================================== |
| 56 |
# Copyright 1999-2013 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r2.ebuild,v 1.1 2013/05/20 14:15:45 idella4 Exp $ |
| 59 |
|
| 60 |
EAPI=4 |
| 61 |
PYTHON_DEPEND="2:2.6" |
| 62 |
|
| 63 |
inherit flag-o-matic eutils multilib python toolchain-funcs |
| 64 |
|
| 65 |
XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles" |
| 66 |
LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci |
| 67 |
GRUB_URL=mirror://gnu-alpha/grub |
| 68 |
SRC_URI=" |
| 69 |
http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz |
| 70 |
$GRUB_URL/grub-0.97.tar.gz |
| 71 |
$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz |
| 72 |
$LIBPCI_URL/pciutils-2.2.9.tar.bz2 |
| 73 |
$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz |
| 74 |
$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz" |
| 75 |
|
| 76 |
S="${WORKDIR}/xen-${PV}" |
| 77 |
|
| 78 |
DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem" |
| 79 |
HOMEPAGE="http://xen.org/" |
| 80 |
LICENSE="GPL-2" |
| 81 |
SLOT="0" |
| 82 |
KEYWORDS="~amd64 ~x86" |
| 83 |
IUSE="custom-cflags" |
| 84 |
|
| 85 |
DEPEND="sys-devel/gettext" |
| 86 |
|
| 87 |
RDEPEND=">=app-emulation/xen-4.2.1" |
| 88 |
|
| 89 |
pkg_setup() { |
| 90 |
python_set_active_version 2 |
| 91 |
python_pkg_setup |
| 92 |
} |
| 93 |
|
| 94 |
retar-externals() { |
| 95 |
# Purely to unclutter src_prepare |
| 96 |
local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz zlib-1.2.3.tar.gz" |
| 97 |
|
| 98 |
# epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative |
| 99 |
sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \ |
| 100 |
-i "${WORKDIR}"/zlib-1.2.3/configure |
| 101 |
sed -e 's:^AR=ar rc:AR=ar:' \ |
| 102 |
-e s':$(AR) $@:$(AR) rc $@:' \ |
| 103 |
-i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in} |
| 104 |
einfo "zlib Makefile edited" |
| 105 |
|
| 106 |
cd "${WORKDIR}" |
| 107 |
tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz |
| 108 |
tar czp grub-0.97 -f grub-0.97.tar.gz |
| 109 |
tar czp lwip -f lwip-1.3.0.tar.gz |
| 110 |
tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz |
| 111 |
mv $set "${S}"/stubdom/ |
| 112 |
einfo "tarballs moved to source" |
| 113 |
} |
| 114 |
|
| 115 |
src_prepare() { |
| 116 |
# if the user *really* wants to use their own custom-cflags, let them |
| 117 |
if use custom-cflags; then |
| 118 |
einfo "User wants their own CFLAGS - removing defaults" |
| 119 |
# try and remove all the default custom-cflags |
| 120 |
find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ |
| 121 |
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ |
| 122 |
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ |
| 123 |
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ |
| 124 |
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ |
| 125 |
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ |
| 126 |
-i {} \; |
| 127 |
fi |
| 128 |
|
| 129 |
# Patch the unmergeable newlib, fix most of the leftover gcc QA issues |
| 130 |
cp "${FILESDIR}"/newlib-implicits.patch stubdom || die |
| 131 |
|
| 132 |
# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading |
| 133 |
epatch "${FILESDIR}"/${P/-pvgrub/}-externals.patch |
| 134 |
|
| 135 |
# Drop .config and Fix gcc-4.6 |
| 136 |
epatch "${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch |
| 137 |
|
| 138 |
# fix jobserver in Makefile |
| 139 |
epatch "${FILESDIR}"/${PN/-pvgrub/}-4.2.0-jserver.patch |
| 140 |
|
| 141 |
#Sec patch |
| 142 |
epatch "${FILESDIR}"/${PN/-pvgrub/}-4-CVE-2012-6075-XSA-41.patch \ |
| 143 |
"${FILESDIR}"/xen-4-CVE-2013-0215-XSA-38.patch \ |
| 144 |
"${FILESDIR}"/xen-4-CVE-2013-1919-XSA-46.patch \ |
| 145 |
"${FILESDIR}"/xen-4-CVE-2013-1922-XSA-48.patch \ |
| 146 |
"${FILESDIR}"/xen-4-CVE-2013-1952-XSA_49.patch |
| 147 |
|
| 148 |
#Substitute for internal downloading. pciutils copied only due to the only .bz2 |
| 149 |
cp $DISTDIR/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom" |
| 150 |
retar-externals || die "re-tar procedure failed" |
| 151 |
} |
| 152 |
|
| 153 |
src_compile() { |
| 154 |
use custom-cflags || unset CFLAGS |
| 155 |
if test-flag-CC -fno-strict-overflow; then |
| 156 |
append-flags -fno-strict-overflow |
| 157 |
fi |
| 158 |
|
| 159 |
emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include |
| 160 |
|
| 161 |
if use x86; then |
| 162 |
emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \ |
| 163 |
XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub |
| 164 |
elif use amd64; then |
| 165 |
emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \ |
| 166 |
XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub |
| 167 |
if use multilib; then |
| 168 |
multilib_toolchain_setup x86 |
| 169 |
emake CC="$(tc-getCC)" AR="$(tc-getAR)" \ |
| 170 |
XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub |
| 171 |
fi |
| 172 |
fi |
| 173 |
} |
| 174 |
|
| 175 |
src_install() { |
| 176 |
if use x86; then |
| 177 |
emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub |
| 178 |
fi |
| 179 |
if use amd64; then |
| 180 |
emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub |
| 181 |
if use multilib; then |
| 182 |
emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub |
| 183 |
fi |
| 184 |
fi |
| 185 |
} |
| 186 |
|
| 187 |
pkg_postinst() { |
| 188 |
elog "Official Xen Guide and the unoffical wiki page:" |
| 189 |
elog " http://www.gentoo.org/doc/en/xen-guide.xml" |
| 190 |
elog " http://en.gentoo-wiki.com/wiki/Xen/" |
| 191 |
} |
| 192 |
|
| 193 |
|
| 194 |
|
| 195 |
1.1 app-emulation/xen-pvgrub/xen-pvgrub-4.2.2.ebuild |
| 196 |
|
| 197 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.2.ebuild?rev=1.1&view=markup |
| 198 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.2.ebuild?rev=1.1&content-type=text/plain |
| 199 |
|
| 200 |
Index: xen-pvgrub-4.2.2.ebuild |
| 201 |
=================================================================== |
| 202 |
# Copyright 1999-2013 Gentoo Foundation |
| 203 |
# Distributed under the terms of the GNU General Public License v2 |
| 204 |
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.2.ebuild,v 1.1 2013/05/20 14:15:45 idella4 Exp $ |
| 205 |
|
| 206 |
EAPI=4 |
| 207 |
PYTHON_DEPEND="2:2.6" |
| 208 |
|
| 209 |
inherit flag-o-matic eutils multilib python toolchain-funcs |
| 210 |
|
| 211 |
XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles" |
| 212 |
LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci |
| 213 |
GRUB_URL=mirror://gnu-alpha/grub |
| 214 |
SRC_URI=" |
| 215 |
http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz |
| 216 |
$GRUB_URL/grub-0.97.tar.gz |
| 217 |
$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz |
| 218 |
$LIBPCI_URL/pciutils-2.2.9.tar.bz2 |
| 219 |
$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz |
| 220 |
$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz" |
| 221 |
|
| 222 |
S="${WORKDIR}/xen-${PV}" |
| 223 |
|
| 224 |
DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem" |
| 225 |
HOMEPAGE="http://xen.org/" |
| 226 |
LICENSE="GPL-2" |
| 227 |
SLOT="0" |
| 228 |
KEYWORDS="~amd64 ~x86" |
| 229 |
IUSE="custom-cflags" |
| 230 |
|
| 231 |
DEPEND="sys-devel/gettext" |
| 232 |
|
| 233 |
RDEPEND=">=app-emulation/xen-4.2.1" |
| 234 |
|
| 235 |
pkg_setup() { |
| 236 |
python_set_active_version 2 |
| 237 |
python_pkg_setup |
| 238 |
} |
| 239 |
|
| 240 |
retar-externals() { |
| 241 |
# Purely to unclutter src_prepare |
| 242 |
local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz zlib-1.2.3.tar.gz" |
| 243 |
|
| 244 |
# epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative |
| 245 |
sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \ |
| 246 |
-i "${WORKDIR}"/zlib-1.2.3/configure |
| 247 |
sed -e 's:^AR=ar rc:AR=ar:' \ |
| 248 |
-e s':$(AR) $@:$(AR) rc $@:' \ |
| 249 |
-i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in} |
| 250 |
einfo "zlib Makefile edited" |
| 251 |
|
| 252 |
cd "${WORKDIR}" |
| 253 |
tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz |
| 254 |
tar czp grub-0.97 -f grub-0.97.tar.gz |
| 255 |
tar czp lwip -f lwip-1.3.0.tar.gz |
| 256 |
tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz |
| 257 |
mv $set "${S}"/stubdom/ |
| 258 |
einfo "tarballs moved to source" |
| 259 |
} |
| 260 |
|
| 261 |
src_prepare() { |
| 262 |
# if the user *really* wants to use their own custom-cflags, let them |
| 263 |
if use custom-cflags; then |
| 264 |
einfo "User wants their own CFLAGS - removing defaults" |
| 265 |
# try and remove all the default custom-cflags |
| 266 |
find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ |
| 267 |
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ |
| 268 |
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ |
| 269 |
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ |
| 270 |
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ |
| 271 |
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ |
| 272 |
-i {} \; |
| 273 |
fi |
| 274 |
|
| 275 |
# Patch the unmergeable newlib, fix most of the leftover gcc QA issues |
| 276 |
cp "${FILESDIR}"/newlib-implicits.patch stubdom || die |
| 277 |
|
| 278 |
# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading |
| 279 |
epatch "${FILESDIR}"/${PN/-pvgrub/}-4.2.1-externals.patch |
| 280 |
|
| 281 |
# Drop .config and Fix gcc-4.6 |
| 282 |
epatch "${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch |
| 283 |
|
| 284 |
# fix jobserver in Makefile |
| 285 |
epatch "${FILESDIR}"/${PN/-pvgrub/}-4.2.0-jserver.patch |
| 286 |
|
| 287 |
#Sec patch |
| 288 |
epatch "${FILESDIR}"/${PN/-pvgrub/}-4-CVE-2012-6075-XSA-41.patch \ |
| 289 |
"${FILESDIR}"/xen-4-CVE-2013-1922-XSA-48.patch \ |
| 290 |
"${FILESDIR}"/xen-4-CVE-2013-1952-XSA-49.patch |
| 291 |
|
| 292 |
#Substitute for internal downloading. pciutils copied only due to the only .bz2 |
| 293 |
cp $DISTDIR/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom" |
| 294 |
retar-externals || die "re-tar procedure failed" |
| 295 |
} |
| 296 |
|
| 297 |
src_compile() { |
| 298 |
use custom-cflags || unset CFLAGS |
| 299 |
if test-flag-CC -fno-strict-overflow; then |
| 300 |
append-flags -fno-strict-overflow |
| 301 |
fi |
| 302 |
|
| 303 |
emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include |
| 304 |
|
| 305 |
if use x86; then |
| 306 |
emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \ |
| 307 |
XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub |
| 308 |
elif use amd64; then |
| 309 |
emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \ |
| 310 |
XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub |
| 311 |
if use multilib; then |
| 312 |
multilib_toolchain_setup x86 |
| 313 |
emake CC="$(tc-getCC)" AR="$(tc-getAR)" \ |
| 314 |
XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub |
| 315 |
fi |
| 316 |
fi |
| 317 |
} |
| 318 |
|
| 319 |
src_install() { |
| 320 |
if use x86; then |
| 321 |
emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub |
| 322 |
fi |
| 323 |
if use amd64; then |
| 324 |
emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub |
| 325 |
if use multilib; then |
| 326 |
emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub |
| 327 |
fi |
| 328 |
fi |
| 329 |
} |
| 330 |
|
| 331 |
pkg_postinst() { |
| 332 |
elog "Official Xen Guide and the unoffical wiki page:" |
| 333 |
elog " http://www.gentoo.org/doc/en/xen-guide.xml" |
| 334 |
elog " http://en.gentoo-wiki.com/wiki/Xen/" |
| 335 |
} |
Archives