make.globals: userpriv + usersandbox, bug #477664

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9c616f1b97d19f9a1a0620eea6ddf74f8111e97a..b2781b1811ced05c1d9ba71e453e6281e620cb79 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -8,6 +8,11 @@ portage-2.2
   new features in 2.2 make use of or require named repositories. The repository
   name is stored in profiles/repo_name in each repository.
 
+portage-2.1.12.14
+==================================
+
+* FEATURES=userpriv and usersandbox are enabled by default.
+
 portage-2.1.12
 ==================================
 

diff --git a/cnf/make.globals b/cnf/make.globals
index 4b524a19d46df234c89e030f217917b7e8a48e3a..d690864e3c190c19057b5f8521e33f9c3fe64609 100644 (file)
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -57,7 +57,7 @@ FEATURES="assume-digests binpkg-logs
           config-protect-if-modified distlocks ebuild-locks
           fixlafiles merge-sync news parallel-fetch preserve-libs protect-owned
           sandbox sfperms strict unknown-features-warn unmerge-logs
-          unmerge-orphans userfetch"
+          unmerge-orphans userfetch userpriv usersandbox"
 
 # Ignore file collisions in /lib/modules since files inside this directory
 # are never unmerged, and therefore collisions must be ignored in order for