summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn P. Davis <zhen@gentoo.org>2003-10-24 13:50:06 +0000
committerJohn P. Davis <zhen@gentoo.org>2003-10-24 13:50:06 +0000
commit97bc226ff533b1798093e7a7c608c86b266fb9c3 (patch)
tree6d74f7f34050dd78fba658450f2f1874be11cf08 /profiles/hardened-x86-1.4
parentMarked stable for x86 and ppc. (diff)
downloadgentoo-2-97bc226ff533b1798093e7a7c608c86b266fb9c3.tar.gz
gentoo-2-97bc226ff533b1798093e7a7c608c86b266fb9c3.tar.bz2
gentoo-2-97bc226ff533b1798093e7a7c608c86b266fb9c3.zip
removed pam limitations until 10135 is addressed
Diffstat (limited to 'profiles/hardened-x86-1.4')
-rw-r--r--profiles/hardened-x86-1.4/make.defaults3
-rw-r--r--profiles/hardened-x86-1.4/packages9
-rw-r--r--profiles/hardened-x86-1.4/use.defaults4
3 files changed, 9 insertions, 7 deletions
diff --git a/profiles/hardened-x86-1.4/make.defaults b/profiles/hardened-x86-1.4/make.defaults
index a952a0a6fc08..cb667189067b 100644
--- a/profiles/hardened-x86-1.4/make.defaults
+++ b/profiles/hardened-x86-1.4/make.defaults
@@ -2,7 +2,8 @@
# System-wide defaults for the gcc 3.2.3 Portage system
# <zhen@gentoo.org> defaults for a hardened system
-USE="x86 berkdb crypt readline nls ssl tcpd zlib"
+# <zhen@gentoo.org> pam added until bug 10135 is fixed
+USE="x86 berkdb crypt readline nls ssl tcpd zlib pam"
ARCH="x86"
COMPILER="gcc3"
diff --git a/profiles/hardened-x86-1.4/packages b/profiles/hardened-x86-1.4/packages
index 71fe3eb6ebf5..9fb3d337f4d3 100644
--- a/profiles/hardened-x86-1.4/packages
+++ b/profiles/hardened-x86-1.4/packages
@@ -85,8 +85,8 @@ virtual/os-headers
*sys-apps/setserial
*<sys-apps/shadow-5
-# we use login from shadow when not using pam
-#*sys-apps/pam-login
+# <zhen@gentoo.org> Again, added until bug 10135 is addressed
+*sys-apps/pam-login
*sys-apps/sharutils
*sys-apps/tar
@@ -107,9 +107,10 @@ virtual/os-headers
*<sys-libs/db-4.1.0
*>=sys-libs/ncurses-5.2.20020112a
-# more pam stuff we dont want.
+# <zhen@gentoo.org> the following 2 lines are
+# necessary until bug 10135 is addressed
>=sys-libs/pam-0.75-r9
-#*sys-libs/pwdb
+*sys-libs/pwdb
*sys-libs/readline
*sys-libs/zlib
diff --git a/profiles/hardened-x86-1.4/use.defaults b/profiles/hardened-x86-1.4/use.defaults
index 382498d6db95..6fb32c8065d7 100644
--- a/profiles/hardened-x86-1.4/use.defaults
+++ b/profiles/hardened-x86-1.4/use.defaults
@@ -36,8 +36,8 @@ sdl media-libs/libsdl
gpm sys-libs/gpm
tcpd sys-apps/tcp-wrappers
-# we dont want pam by default
-#pam sys-libs/pam
+# <zhen@gentoo.org> unmasked until bug 10135 gets addressed
+pam sys-libs/pam
libwww net-libs/libwww
ssl dev-libs/openssl