1 |
commit: d1f49ad34ca52b0c4e0845e32b1492d1172a92f2 |
2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 2 00:10:58 2013 +0000 |
4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 27 02:48:23 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=d1f49ad3 |
7 |
|
8 |
Update admincd stage2 specs. |
9 |
Stop removing gcc and other dev packages - fixes bug 458536. |
10 |
Drop lib64 dirs from the x86 spec. Drop old dirs no longer present and clean spec files. |
11 |
|
12 |
--- |
13 |
.../specs/amd64/hardened/admincd-stage2.spec | 31 -------------- |
14 |
.../weekly/specs/x86/hardened/admincd-stage2.spec | 43 -------------------- |
15 |
2 files changed, 0 insertions(+), 74 deletions(-) |
16 |
|
17 |
diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec |
18 |
index 2d65910..c636c46 100644 |
19 |
--- a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec |
20 |
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec |
21 |
@@ -82,14 +82,6 @@ boot/kernel/gentoo/packages: |
22 |
media-sound/alsa-utils |
23 |
net-dialup/globespan-adsl |
24 |
|
25 |
-# These were not stable at time of snapshot/release. |
26 |
-# net-wireless/rtl8180 |
27 |
-# net-wireless/rtl8187 |
28 |
-# net-wireless/adm8211 |
29 |
-# net-wireless/acx |
30 |
-# net-wireless/ipw3945 |
31 |
-# net-wireless/rt2500 |
32 |
- |
33 |
sys-apps/pcmciautils |
34 |
sys-kernel/linux-firmware |
35 |
sys-kernel/spl |
36 |
@@ -103,9 +95,6 @@ livecd/unmerge: |
37 |
app-admin/perl-cleaner |
38 |
app-admin/python-updater |
39 |
app-arch/cpio |
40 |
- dev-libs/gmp |
41 |
- dev-libs/libxml2 |
42 |
- dev-libs/mpfr |
43 |
dev-python/pycrypto |
44 |
dev-util/pkgconfig |
45 |
perl-core/PodParser |
46 |
@@ -116,8 +105,6 @@ livecd/unmerge: |
47 |
sys-apps/man |
48 |
sys-apps/man-pages |
49 |
sys-apps/miscfiles |
50 |
-# sys-apps/portage |
51 |
-# sys-apps/sandbox |
52 |
sys-apps/texinfo |
53 |
sys-devel/autoconf |
54 |
sys-devel/autoconf-wrapper |
55 |
@@ -126,8 +113,6 @@ livecd/unmerge: |
56 |
sys-devel/binutils-config |
57 |
sys-devel/bison |
58 |
sys-devel/flex |
59 |
-# This might be needed for software speech. |
60 |
- sys-devel/gcc |
61 |
sys-devel/gcc-config |
62 |
sys-devel/gettext |
63 |
sys-devel/gnuconfig |
64 |
@@ -135,8 +120,6 @@ livecd/unmerge: |
65 |
sys-devel/m4 |
66 |
sys-devel/make |
67 |
sys-devel/patch |
68 |
- sys-libs/db |
69 |
- sys-libs/gdbm |
70 |
sys-libs/libkudzu |
71 |
sys-kernel/genkernel |
72 |
sys-kernel/linux-headers |
73 |
@@ -148,7 +131,6 @@ livecd/empty: |
74 |
/etc/cron.weekly |
75 |
/etc/logrotate.d |
76 |
/etc/modules.autoload.d |
77 |
- /etc/rsync |
78 |
/etc/runlevels/single |
79 |
/etc/skel |
80 |
/lib/dev-state |
81 |
@@ -171,9 +153,6 @@ livecd/empty: |
82 |
/usr/lib/nfs |
83 |
/usr/lib/perl5/site_perl |
84 |
/usr/lib/portage |
85 |
- /usr/lib/python2.2 |
86 |
- /usr/lib/python2.3 |
87 |
- /usr/lib/python2.4/test |
88 |
/usr/lib64/X11/config |
89 |
/usr/lib64/X11/doc |
90 |
/usr/lib64/X11/etc |
91 |
@@ -184,13 +163,8 @@ livecd/empty: |
92 |
/usr/lib64/nfs |
93 |
/usr/lib64/perl5/site_perl |
94 |
/usr/lib64/portage |
95 |
- /usr/lib64/python2.2 |
96 |
- /usr/lib64/python2.3 |
97 |
- /usr/lib64/python2.4/test |
98 |
/usr/local |
99 |
/usr/portage |
100 |
- /usr/powerpc-unknown-linux-gnu |
101 |
- /usr/powerpc64-unknown-linux-gnu |
102 |
/usr/share/aclocal |
103 |
/usr/share/baselayout |
104 |
/usr/share/binutils-data |
105 |
@@ -216,7 +190,6 @@ livecd/empty: |
106 |
/usr/share/texinfo |
107 |
/usr/share/unimaps |
108 |
/usr/share/zoneinfo |
109 |
- /usr/sparc-unknown-linux-gnu |
110 |
/usr/src |
111 |
/var/cache |
112 |
/var/empty |
113 |
@@ -288,10 +261,6 @@ livecd/rm: |
114 |
/usr/bin/readelf |
115 |
/usr/bin/repoman |
116 |
/usr/bin/size |
117 |
- /usr/bin/powerpc-unknown-linux-gnu-* |
118 |
- /usr/bin/powerpc64-unknown-linux-gnu-* |
119 |
- /usr/bin/sparc-unknown-linux-gnu-* |
120 |
- /usr/bin/sparc64-unknown-linux-gnu-* |
121 |
/usr/bin/strip |
122 |
/usr/bin/tbz2tool |
123 |
/usr/bin/xpak |
124 |
|
125 |
diff --git a/releases/weekly/specs/x86/hardened/admincd-stage2.spec b/releases/weekly/specs/x86/hardened/admincd-stage2.spec |
126 |
index 5d50a06..b17fcad 100644 |
127 |
--- a/releases/weekly/specs/x86/hardened/admincd-stage2.spec |
128 |
+++ b/releases/weekly/specs/x86/hardened/admincd-stage2.spec |
129 |
@@ -82,14 +82,6 @@ boot/kernel/gentoo/packages: |
130 |
media-sound/alsa-utils |
131 |
net-dialup/globespan-adsl |
132 |
|
133 |
-# These were not stable at time of snapshot/release. |
134 |
-# net-wireless/rtl8180 |
135 |
-# net-wireless/rtl8187 |
136 |
-# net-wireless/adm8211 |
137 |
-# net-wireless/acx |
138 |
-# net-wireless/ipw3945 |
139 |
-# net-wireless/rt2500 |
140 |
- |
141 |
sys-apps/pcmciautils |
142 |
sys-kernel/linux-firmware |
143 |
|
144 |
@@ -100,9 +92,6 @@ livecd/unmerge: |
145 |
app-admin/perl-cleaner |
146 |
app-admin/python-updater |
147 |
app-arch/cpio |
148 |
- dev-libs/gmp |
149 |
- dev-libs/libxml2 |
150 |
- dev-libs/mpfr |
151 |
dev-python/pycrypto |
152 |
dev-util/pkgconfig |
153 |
perl-core/PodParser |
154 |
@@ -113,8 +102,6 @@ livecd/unmerge: |
155 |
sys-apps/man |
156 |
sys-apps/man-pages |
157 |
sys-apps/miscfiles |
158 |
-# sys-apps/portage |
159 |
-# sys-apps/sandbox |
160 |
sys-apps/texinfo |
161 |
sys-devel/autoconf |
162 |
sys-devel/autoconf-wrapper |
163 |
@@ -123,8 +110,6 @@ livecd/unmerge: |
164 |
sys-devel/binutils-config |
165 |
sys-devel/bison |
166 |
sys-devel/flex |
167 |
-# This might be needed for software speech. |
168 |
- sys-devel/gcc |
169 |
sys-devel/gcc-config |
170 |
sys-devel/gettext |
171 |
sys-devel/gnuconfig |
172 |
@@ -132,8 +117,6 @@ livecd/unmerge: |
173 |
sys-devel/m4 |
174 |
sys-devel/make |
175 |
sys-devel/patch |
176 |
- sys-libs/db |
177 |
- sys-libs/gdbm |
178 |
sys-libs/libkudzu |
179 |
sys-kernel/genkernel |
180 |
sys-kernel/linux-headers |
181 |
@@ -145,13 +128,10 @@ livecd/empty: |
182 |
/etc/cron.weekly |
183 |
/etc/logrotate.d |
184 |
/etc/modules.autoload.d |
185 |
- /etc/rsync |
186 |
/etc/runlevels/single |
187 |
/etc/skel |
188 |
/lib/dev-state |
189 |
/lib/udev-state |
190 |
- /lib64/dev-state |
191 |
- /lib64/udev-state |
192 |
/root/.ccache |
193 |
/tmp |
194 |
/usr/diet/include |
195 |
@@ -168,26 +148,8 @@ livecd/empty: |
196 |
/usr/lib/nfs |
197 |
/usr/lib/perl5/site_perl |
198 |
/usr/lib/portage |
199 |
- /usr/lib/python2.2 |
200 |
- /usr/lib/python2.3 |
201 |
- /usr/lib/python2.4/test |
202 |
- /usr/lib64/X11/config |
203 |
- /usr/lib64/X11/doc |
204 |
- /usr/lib64/X11/etc |
205 |
- /usr/lib64/awk |
206 |
- /usr/lib64/ccache |
207 |
- /usr/lib64/gcc-config |
208 |
- /usr/lib64/gconv |
209 |
- /usr/lib64/nfs |
210 |
- /usr/lib64/perl5/site_perl |
211 |
- /usr/lib64/portage |
212 |
- /usr/lib64/python2.2 |
213 |
- /usr/lib64/python2.3 |
214 |
- /usr/lib64/python2.4/test |
215 |
/usr/local |
216 |
/usr/portage |
217 |
- /usr/powerpc-unknown-linux-gnu |
218 |
- /usr/powerpc64-unknown-linux-gnu |
219 |
/usr/share/aclocal |
220 |
/usr/share/baselayout |
221 |
/usr/share/binutils-data |
222 |
@@ -213,7 +175,6 @@ livecd/empty: |
223 |
/usr/share/texinfo |
224 |
/usr/share/unimaps |
225 |
/usr/share/zoneinfo |
226 |
- /usr/sparc-unknown-linux-gnu |
227 |
/usr/src |
228 |
/var/cache |
229 |
/var/empty |
230 |
@@ -285,10 +246,6 @@ livecd/rm: |
231 |
/usr/bin/readelf |
232 |
/usr/bin/repoman |
233 |
/usr/bin/size |
234 |
- /usr/bin/powerpc-unknown-linux-gnu-* |
235 |
- /usr/bin/powerpc64-unknown-linux-gnu-* |
236 |
- /usr/bin/sparc-unknown-linux-gnu-* |
237 |
- /usr/bin/sparc64-unknown-linux-gnu-* |
238 |
/usr/bin/strip |
239 |
/usr/bin/tbz2tool |
240 |
/usr/bin/xpak |