| 1 |
commit: e3eb201b5e5c4ab9cc9849cd4580545b0a53e994 |
| 2 |
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 25 16:17:02 2018 +0000 |
| 4 |
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 25 16:17:02 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=e3eb201b |
| 7 |
|
| 8 |
portage/stages: apply -filecaps globally |
| 9 |
|
| 10 |
releases/weekly/portage/stages/package.use/releng/iputils | 2 -- |
| 11 |
releases/weekly/portage/stages/package.use/releng/no-filecaps | 7 +++++++ |
| 12 |
releases/weekly/portage/stages/package.use/releng/pam | 2 -- |
| 13 |
3 files changed, 7 insertions(+), 4 deletions(-) |
| 14 |
|
| 15 |
diff --git a/releases/weekly/portage/stages/package.use/releng/iputils b/releases/weekly/portage/stages/package.use/releng/iputils |
| 16 |
deleted file mode 100644 |
| 17 |
index 4257bb4c..00000000 |
| 18 |
--- a/releases/weekly/portage/stages/package.use/releng/iputils |
| 19 |
+++ /dev/null |
| 20 |
@@ -1,2 +0,0 @@ |
| 21 |
-# Disable caps and filecaps or ping on the stage will only work for root |
| 22 |
-net-misc/iputils -caps -filecaps |
| 23 |
|
| 24 |
diff --git a/releases/weekly/portage/stages/package.use/releng/no-filecaps b/releases/weekly/portage/stages/package.use/releng/no-filecaps |
| 25 |
new file mode 100644 |
| 26 |
index 00000000..901e5c36 |
| 27 |
--- /dev/null |
| 28 |
+++ b/releases/weekly/portage/stages/package.use/releng/no-filecaps |
| 29 |
@@ -0,0 +1,7 @@ |
| 30 |
+# For stage building, we cannot be sure the final unpack destination will have |
| 31 |
+# xattr/fcaps support. To be safe, we build stages without filecaps, but allow |
| 32 |
+# filecaps to be turned back on @ next full world upgrade. The ebuilds using |
| 33 |
+# fcaps eclass will have more logic to safely fall back in case of missing |
| 34 |
+# support. |
| 35 |
+ |
| 36 |
+*/* -filecaps |
| 37 |
|
| 38 |
diff --git a/releases/weekly/portage/stages/package.use/releng/pam b/releases/weekly/portage/stages/package.use/releng/pam |
| 39 |
deleted file mode 100644 |
| 40 |
index 196ad1b7..00000000 |
| 41 |
--- a/releases/weekly/portage/stages/package.use/releng/pam |
| 42 |
+++ /dev/null |
| 43 |
@@ -1,2 +0,0 @@ |
| 44 |
-# Disable filecaps or we get a circular dep between sys-libs/pam and sys-libs/filecaps |
| 45 |
-sys-libs/pam -filecaps |
Archives