1 |
commit: 98e0bafc71a190ce55646ac66bdd0d215544244e |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 10 09:36:03 2018 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 10 09:36:03 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98e0bafc |
7 |
|
8 |
app-emulation/xen-pvgrub: security cleanup (bug #643350) |
9 |
|
10 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
11 |
|
12 |
app-emulation/xen-pvgrub/Manifest | 1 - |
13 |
app-emulation/xen-pvgrub/xen-pvgrub-4.9.1.ebuild | 161 ----------------------- |
14 |
2 files changed, 162 deletions(-) |
15 |
|
16 |
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest |
17 |
index fe7068966a4..408ebf7906c 100644 |
18 |
--- a/app-emulation/xen-pvgrub/Manifest |
19 |
+++ b/app-emulation/xen-pvgrub/Manifest |
20 |
@@ -3,6 +3,5 @@ DIST lwip-1.3.0.tar.gz 398933 BLAKE2B 3567a593eec3d247213daaaab57d9456c9cae50329 |
21 |
DIST newlib-1.16.0.tar.gz 12024353 BLAKE2B 26d3308148fb99baf8ad02eee4cc699cfac690100ea63aaa4be03b86d12dade238478342514bd083cbc3d27964ac42eb8dae3873fdac5ff2c593fc4fb39b2309 SHA512 40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3 |
22 |
DIST pciutils-2.2.9.tar.bz2 212265 BLAKE2B 014b664e90c64e7255c9e21fc25a2cc60d57f47ce282fc0331a0481a460b237783bd3774dd0689e1596d4a0be0d2889faad904da01a6f02147464bce1d1b1bc0 SHA512 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5 |
23 |
DIST polarssl-1.1.4-gpl.tgz 611340 BLAKE2B 613da06dda9e4b86db5a4d616a0a0afee98c907c3c6b352eed3d9e500fc5739e62eb4f6fc32ff02579c6a6de9bd49fcd2c8bd8b2d158a5050cbaa82118d61ef0 SHA512 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad |
24 |
-DIST xen-4.9.1.tar.gz 23368303 BLAKE2B 4cfddb351c9a4aa08227138dc1afa921f3d1880048f897428226da38eff9470cd81ae9896f174583048dad0ba8d5c1426df58b029115ba1623366d1980630c0d SHA512 9d22f0aa5dcd01a1c105d17c14bce570cc597e884ddb9b4a46b80a72f647625b76ae5213cede423d0458c14e1906983595a9269bb6e6ff2e9e7e4dea840f4274 |
25 |
DIST xen-4.9.2.tar.gz 23392753 BLAKE2B 5f96f0e5062eff8ac2971eef85ea2bae0e94e7542151237937a1cf7e74690bb0ce1c952e830d2fc13b3277f70b9ed1de511afe4f780ad7b3be0c58742ece39b2 SHA512 e06aec25439abcc548c174ba8e271c23031ea704bcc2480905140aa68490064fbb1c58d9c4174f6617b4f7bbcddfda284317df6f480a6e5b5b5a2c71fbe0ac93 |
26 |
DIST zlib-1.2.3.tar.gz 496597 BLAKE2B 603020b70cd52b83e48bde420b86e2acfd29d69bf7476eecbeeb07d1b8bcab703d2cbd3eab77772990bddb8c268f13594592ce985798d49e2d6ba25104d49f22 SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e |
27 |
|
28 |
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.9.1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.9.1.ebuild |
29 |
deleted file mode 100644 |
30 |
index 138f1da19fe..00000000000 |
31 |
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.9.1.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,161 +0,0 @@ |
34 |
-# Copyright 1999-2018 Gentoo Foundation |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=6 |
38 |
- |
39 |
-PYTHON_COMPAT=( python2_7 ) |
40 |
-PYTHON_REQ_USE='xml,threads' |
41 |
- |
42 |
-inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs |
43 |
- |
44 |
-XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles" |
45 |
-LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci |
46 |
-GRUB_URL=mirror://gnu-alpha/grub |
47 |
- |
48 |
-UPSTREAM_VER= |
49 |
-[[ -n ${UPSTREAM_VER} ]] && \ |
50 |
- UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" |
51 |
- |
52 |
-SRC_URI=" |
53 |
- https://downloads.xenproject.org/release/xen/${PV}/xen-${PV}.tar.gz |
54 |
- $GRUB_URL/grub-0.97.tar.gz |
55 |
- $XEN_EXTFILES_URL/zlib-1.2.3.tar.gz |
56 |
- $LIBPCI_URL/pciutils-2.2.9.tar.bz2 |
57 |
- $XEN_EXTFILES_URL/lwip-1.3.0.tar.gz |
58 |
- $XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz |
59 |
- $XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz |
60 |
- ${UPSTREAM_PATCHSET_URI}" |
61 |
- |
62 |
-S="${WORKDIR}/xen-${PV}" |
63 |
- |
64 |
-DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem" |
65 |
-HOMEPAGE="https://www.xenproject.org" |
66 |
-LICENSE="GPL-2" |
67 |
-SLOT="0" |
68 |
-KEYWORDS="amd64 ~x86" |
69 |
-IUSE="custom-cflags" |
70 |
- |
71 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
72 |
- |
73 |
-DEPEND="sys-devel/gettext |
74 |
- sys-devel/bin86 |
75 |
- sys-apps/texinfo |
76 |
- x11-libs/pixman" |
77 |
- |
78 |
-RDEPEND="${PYTHON_DEPS} |
79 |
- >=app-emulation/xen-tools-${PV}" |
80 |
- |
81 |
-pkg_setup() { |
82 |
- python-single-r1_pkg_setup |
83 |
-} |
84 |
- |
85 |
-retar-externals() { |
86 |
- # Purely to unclutter src_prepare |
87 |
- local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz" |
88 |
- |
89 |
- # epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative |
90 |
- sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \ |
91 |
- -i "${WORKDIR}"/zlib-1.2.3/configure |
92 |
- sed -e 's:^AR=ar rc:AR=ar:' \ |
93 |
- -e s':$(AR) $@:$(AR) rc $@:' \ |
94 |
- -i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in} |
95 |
- einfo "zlib Makefile edited" |
96 |
- |
97 |
- cd "${WORKDIR}" |
98 |
- tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz |
99 |
- tar czp grub-0.97 -f grub-0.97.tar.gz |
100 |
- tar czp lwip -f lwip-1.3.0.tar.gz |
101 |
- tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz |
102 |
- tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz |
103 |
- mv $set "${S}"/stubdom/ |
104 |
- einfo "tarballs moved to source" |
105 |
-} |
106 |
- |
107 |
-src_prepare() { |
108 |
- # Upstream's patchset |
109 |
- if [[ -n ${UPSTREAM_VER} ]]; then |
110 |
- einfo "Try to apply Xen Upstream patch set" |
111 |
- EPATCH_SUFFIX="patch" \ |
112 |
- EPATCH_FORCE="yes" \ |
113 |
- EPATCH_OPTS="-p1" \ |
114 |
- epatch "${WORKDIR}"/patches-upstream |
115 |
- fi |
116 |
- |
117 |
- # if the user *really* wants to use their own custom-cflags, let them |
118 |
- if use custom-cflags; then |
119 |
- einfo "User wants their own CFLAGS - removing defaults" |
120 |
- # try and remove all the default custom-cflags |
121 |
- find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ |
122 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ |
123 |
- -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ |
124 |
- -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ |
125 |
- -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ |
126 |
- -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ |
127 |
- -i {} \; |
128 |
- fi |
129 |
- |
130 |
- # Patch the unmergeable newlib, fix most of the leftover gcc QA issues |
131 |
- cp "${FILESDIR}"/newlib-implicits.patch stubdom || die |
132 |
- |
133 |
- # Patch stubdom/Makefile to patch insource newlib & prevent internal downloading |
134 |
- epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-externals.patch |
135 |
- |
136 |
- # fix jobserver in Makefile |
137 |
- epatch "${FILESDIR}"/${PN}-4.8-jserver.patch |
138 |
- |
139 |
- #Substitute for internal downloading. pciutils copied only due to the only .bz2 |
140 |
- cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom" |
141 |
- retar-externals || die "re-tar procedure failed" |
142 |
- |
143 |
- default |
144 |
-} |
145 |
- |
146 |
-src_configure() { |
147 |
- local myconf="--prefix=${PREFIX}/usr \ |
148 |
- --libdir=${PREFIX}/usr/$(get_libdir) \ |
149 |
- --libexecdir=${PREFIX}/usr/libexec \ |
150 |
- --disable-werror \ |
151 |
- --disable-xen" |
152 |
- |
153 |
- econf ${myconf} |
154 |
-} |
155 |
- |
156 |
-src_compile() { |
157 |
- use custom-cflags || unset CFLAGS |
158 |
- if test-flag-CC -fno-strict-overflow; then |
159 |
- append-flags -fno-strict-overflow |
160 |
- fi |
161 |
- |
162 |
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include |
163 |
- |
164 |
- if use x86; then |
165 |
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \ |
166 |
- XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub |
167 |
- elif use amd64; then |
168 |
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \ |
169 |
- XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub |
170 |
- if has_multilib_profile; then |
171 |
- multilib_toolchain_setup x86 |
172 |
- emake CC="$(tc-getCC)" AR="$(tc-getAR)" \ |
173 |
- XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub |
174 |
- fi |
175 |
- fi |
176 |
-} |
177 |
- |
178 |
-src_install() { |
179 |
- if use x86; then |
180 |
- emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub |
181 |
- fi |
182 |
- if use amd64; then |
183 |
- emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub |
184 |
- if has_multilib_profile; then |
185 |
- emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub |
186 |
- fi |
187 |
- fi |
188 |
-} |
189 |
- |
190 |
-pkg_postinst() { |
191 |
- elog "Official Xen Guide and the offical wiki page:" |
192 |
- elog "https://wiki.gentoo.org/wiki/Xen" |
193 |
- elog "https://wiki.xen.org/wiki/Main_Page" |
194 |
-} |