diff options
| -rw-r--r-- | cnf/make.conf | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/cnf/make.conf b/cnf/make.conf index 7bff547ea..6c1dc03c4 100644 --- a/cnf/make.conf +++ b/cnf/make.conf @@ -82,14 +82,14 @@ # # DISTDIR is where all of the source code tarballs will be placed for # emerges. The source code is maintained here unless you delete -# it. The entire repository of tarballs for gentoo is 9G. This is +# it. The entire repository of tarballs for Gentoo is 9G. This is # considerably more than any user will ever download. 2-3G is # a large DISTDIR. #DISTDIR=${PORTDIR}/distfiles # # PKGDIR is the location of binary packages that you can have created # with '--buildpkg' or '-b' while emerging a package. This can get -# upto several hundred megs, or even a few gigs. +# up to several hundred megs, or even a few gigs. #PKGDIR=${PORTDIR}/packages # # PORT_LOGDIR is the location where portage will store all the logs it @@ -240,7 +240,7 @@ # developers as well. # # 'assume-digests' -# when commiting work to cvs with repoman(1), assume that all +# when committing work to cvs with repoman(1), assume that all # existing SRC_URI digests are correct. This feature also # affects digest generation via ebuild(1) and emerge(1) (emerge # generates digests only when the 'digest' feature is enabled). @@ -276,7 +276,7 @@ # from a merge. # 'keepwork' prevents the clean phase from deleting the WORKDIR. # 'test' causes ebuilds to perform testing phases if they are capable -# of it. Some packages support this automaticaly via makefiles. +# of it. Some packages support this automatically via makefiles. # 'metadata-transfer' # automatically perform a metadata transfer when `emerge --sync` # is run. @@ -292,6 +292,9 @@ # 'sandbox' enables sandboxing when running emerge and ebuild. # 'strict' causes portage to react strongly to conditions that are # potentially dangerous, like missing/incorrect Manifest files. +# 'stricter' causes portage to react strongly to conditions that may +# conflict with system security provisions (for example +# textrels, executable stacks). # 'userfetch' when portage is run as root, drop privileges to # portage:portage during the fetching of package sources. # 'userpriv' allows portage to drop root privileges while it is compiling, @@ -369,7 +372,7 @@ PORTAGE_ELOG_CLASSES="warn error log" # Examples: #PORTAGE_ELOG_MAILURI="root@localhost localhost" (this is also the default setting) #PORTAGE_ELOG_MAILURI="user@some.domain mail.some.domain" (sends mails to user@some.domain using the mailserver mail.some.domain) -#PORTAGE_ELOG_MAILURI="user@some.domain user:secret@mail.some.domain:100465" (this is left uncommented as a reader excercise ;) +#PORTAGE_ELOG_MAILURI="user@some.domain user:secret@mail.some.domain:100465" (this is left uncommented as a reader exercise ;) # PORTAGE_ELOG_MAILFROM: you can set the from-address of logmails with this variable, # if unset mails are sent by "portage" (this default may fail @@ -377,7 +380,7 @@ PORTAGE_ELOG_CLASSES="warn error log" #PORTAGE_ELOG_MAILFROM="portage@some.domain" # PORTAGE_ELOG_MAILSUBJECT: template string to be used as subject for logmails. The following -# variables are exanded: +# variables are expanded: # ${PACKAGE} - see description of PORTAGE_ELOG_COMMAND # ${HOST} - FQDN of the host portage is running on #PORTAGE_ELOG_MAILSUBJECT="package \${PACKAGE} merged on \${HOST} with notice" |