1 |
commit: ac28ea95507c55d0409097fc9347fa7dc2850776 |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 2 18:30:13 2016 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 2 18:35:28 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac28ea95 |
7 |
|
8 |
sys-fs/aufs3: Drop vulnerable version |
9 |
|
10 |
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=575122 |
11 |
|
12 |
Package-Manager: portage-2.3.0 |
13 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
14 |
|
15 |
sys-fs/aufs3/Manifest | 1 - |
16 |
sys-fs/aufs3/aufs3-3_p20150622.ebuild | 172 ---------------------------------- |
17 |
2 files changed, 173 deletions(-) |
18 |
|
19 |
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest |
20 |
index c57ee9c..c67f57b 100644 |
21 |
--- a/sys-fs/aufs3/Manifest |
22 |
+++ b/sys-fs/aufs3/Manifest |
23 |
@@ -1,3 +1,2 @@ |
24 |
-DIST aufs3-standalone-3_p20150622.tar.xz 3063280 SHA256 2fa44f9df9d58df7a5251ebd2cec206fa90ca8e110c1f657df18e62adb170517 SHA512 fe7a62249130d68f72b14f21b57e5d6db402f56637afc876068d916e78884d08476c804ac58ef06eeb9e13e0a2e1cb75ac782f83054f1c06cb85c74a3c48ba01 WHIRLPOOL 7f85a5324d51e148c97109357c13fcab76121d25ee006211d2212f9c6d352330be110569848c8ca96421bc4582025c73030329d7e501837e4d18cafd6002f153 |
25 |
DIST aufs3-standalone-3_p20160219.tar.xz 3256736 SHA256 23652c6d8fd12a9a29454293f13add7e0f97f2ec542b69e5dfecbc99064c4247 SHA512 af65cb3d9890c05ec24d64d27759d8c0fa98f35887d62a7ec77ebc496ec9de02563bc5a3e05b67c342926b062fe077c7a8de543291177a4e0210b2159027e1af WHIRLPOOL 1ed7042c9e1e8efc29fa36fcbd2f09a10ffa51cc9d6b349869f6f6947ed27399deb2fa1035df7dbaf69dcbfa7eddb6f240b934a343732ace26f77bcf2e72167a |
26 |
DIST aufs3-standalone-3_p20160223.tar.xz 3270932 SHA256 4e213e678991a028595893a2c3425894bef021cd374a6798f80ad8863bf7f593 SHA512 37805b54a2471def5948d3484349de7bfc4fee09788b36b9589aba2006484cf330bb642f27862d74a528999cf2e7fa4888b5d46b54bb3e7f8468c6857f34730f WHIRLPOOL 1e42d1a32a62b25923041b8f71b00f8ae1a8b8524752b1d796ae2fd2ada79792cbe2a35ad380e24ecad8374bbd432674763d69ffa9144dfc3074742b33d4d138 |
27 |
|
28 |
diff --git a/sys-fs/aufs3/aufs3-3_p20150622.ebuild b/sys-fs/aufs3/aufs3-3_p20150622.ebuild |
29 |
deleted file mode 100644 |
30 |
index 9f8ba0e..0000000 |
31 |
--- a/sys-fs/aufs3/aufs3-3_p20150622.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,172 +0,0 @@ |
34 |
-# Copyright 1999-2015 Gentoo Foundation |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
-# $Id$ |
37 |
- |
38 |
-EAPI=5 |
39 |
- |
40 |
-inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs |
41 |
- |
42 |
-AUFS_VERSION="${PV%%_p*}" |
43 |
-# highest branch version |
44 |
-PATCH_MAX_VER=19 |
45 |
-# highest supported version |
46 |
-KERN_MAX_VER=20 |
47 |
-# lowest supported version |
48 |
-KERN_MIN_VER=14 |
49 |
- |
50 |
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs" |
51 |
-HOMEPAGE="http://aufs.sourceforge.net/" |
52 |
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz" |
53 |
- |
54 |
-LICENSE="GPL-2" |
55 |
-SLOT="0" |
56 |
-KEYWORDS="amd64 x86" |
57 |
-IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs" |
58 |
- |
59 |
-DEPEND=" |
60 |
- dev-util/patchutils |
61 |
- dev-vcs/git" |
62 |
-RDEPEND=" |
63 |
- sys-fs/aufs-util |
64 |
- !sys-fs/aufs |
65 |
- !sys-fs/aufs2 |
66 |
- !sys-fs/aufs4" |
67 |
- |
68 |
-S="${WORKDIR}"/${PN}-standalone |
69 |
- |
70 |
-MODULE_NAMES="aufs(misc:${S})" |
71 |
- |
72 |
-pkg_setup() { |
73 |
- CONFIG_CHECK+=" !AUFS_FS" |
74 |
- use inotify && CONFIG_CHECK+=" ~FSNOTIFY" |
75 |
- use nfs && CONFIG_CHECK+=" EXPORTFS" |
76 |
- use fuse && CONFIG_CHECK+=" ~FUSE_FS" |
77 |
- use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS" |
78 |
- use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources" |
79 |
- |
80 |
- # this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system |
81 |
- [ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return |
82 |
- |
83 |
- get_version |
84 |
- kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade." |
85 |
- kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new" |
86 |
- |
87 |
- linux-mod_pkg_setup |
88 |
- |
89 |
- if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then |
90 |
- PATCH_BRANCH="x-rcN" |
91 |
- elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then |
92 |
- PATCH_BRANCH="${KV_MINOR}".21+ |
93 |
- elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then |
94 |
- PATCH_BRANCH="${KV_MINOR}".1+ |
95 |
- else |
96 |
- PATCH_BRANCH="${KV_MINOR}" |
97 |
- fi |
98 |
- |
99 |
- case ${KV_EXTRA} in |
100 |
- "") |
101 |
- elog "It seems you are using vanilla-sources with aufs3" |
102 |
- elog "Please use sys-kernel/aufs-sources with USE=vanilla" |
103 |
- elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade" |
104 |
- ;; |
105 |
- "-gentoo") |
106 |
- elog "It seems you are using gentoo-sources with aufs3" |
107 |
- elog "Please use sys-kernel/aufs-sources" |
108 |
- elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade" |
109 |
- ;; |
110 |
- esac |
111 |
- |
112 |
- pushd "${T}" &> /dev/null |
113 |
- unpack ${A} |
114 |
- cd ${PN}-standalone || die |
115 |
- local module_branch=origin/${PN}.${PATCH_BRANCH} |
116 |
- einfo "Using ${module_branch} as patch source" |
117 |
- git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die |
118 |
- combinediff ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch |
119 |
- combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch |
120 |
- if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then |
121 |
- if use kernel-patch; then |
122 |
- cd ${KV_DIR} |
123 |
- ewarn "Patching your kernel..." |
124 |
- patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null |
125 |
- epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch |
126 |
- ewarn "You need to compile your kernel with the applied patch" |
127 |
- ewarn "to be able to load and use the aufs kernel module" |
128 |
- else |
129 |
- eerror "You need to apply a patch to your kernel to compile and run the ${PN} module" |
130 |
- eerror "Either enable the kernel-patch useflag to do it with this ebuild" |
131 |
- eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand" |
132 |
- die "missing kernel patch, please apply it first" |
133 |
- fi |
134 |
- fi |
135 |
- popd &> /dev/null |
136 |
- export PKG_SETUP_HAS_BEEN_RAN=1 |
137 |
-} |
138 |
- |
139 |
-set_config() { |
140 |
- for option in $*; do |
141 |
- grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option" |
142 |
- sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die |
143 |
- done |
144 |
-} |
145 |
- |
146 |
-src_prepare() { |
147 |
- local module_branch=origin/${PN}.${PATCH_BRANCH} |
148 |
- |
149 |
- einfo "Using for module creation branch ${module_branch}" |
150 |
- git checkout -q -b local-gentoo ${module_branch} || die |
151 |
- |
152 |
- # All config options to off |
153 |
- sed "s:= y:=:g" -i config.mk || die |
154 |
- |
155 |
- set_config RDU BRANCH_MAX_127 SBILIST |
156 |
- |
157 |
- use debug && set_config DEBUG |
158 |
- use fuse && set_config BR_FUSE POLL |
159 |
- use hfs && set_config BR_HFSPLUS |
160 |
- use inotify && set_config HNOTIFY HFSNOTIFY |
161 |
- use nfs && set_config EXPORT |
162 |
- use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64 |
163 |
- use ramfs && set_config BR_RAMFS |
164 |
- |
165 |
- if use pax_kernel; then |
166 |
- if kernel_is ge 3 11; then |
167 |
- epatch "${FILESDIR}"/pax-3.11.patch |
168 |
- else |
169 |
- epatch "${FILESDIR}"/pax-3.patch |
170 |
- fi |
171 |
- fi |
172 |
- |
173 |
- sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die |
174 |
-} |
175 |
- |
176 |
-src_compile() { |
177 |
- local ARCH=x86 |
178 |
- |
179 |
- emake \ |
180 |
- CC=$(tc-getCC) \ |
181 |
- LD=$(tc-getLD) \ |
182 |
- LDFLAGS="$(raw-ldflags)" \ |
183 |
- ARCH=$(tc-arch-kernel) \ |
184 |
- CONFIG_AUFS_FS=m \ |
185 |
- KDIR="${KV_OUT_DIR}" |
186 |
-} |
187 |
- |
188 |
-src_install() { |
189 |
- linux-mod_src_install |
190 |
- |
191 |
- insinto /usr/share/doc/${PF} |
192 |
- |
193 |
- use doc && doins -r Documentation |
194 |
- |
195 |
- use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch |
196 |
- |
197 |
- dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch |
198 |
- |
199 |
- readme.gentoo_create_doc |
200 |
-} |
201 |
- |
202 |
-pkg_postinst() { |
203 |
- readme.gentoo_pkg_postinst |
204 |
- linux-mod_pkg_postinst |
205 |
-} |