summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2010-04-29 09:23:39 +0000
committerPeter Volkov <pva@gentoo.org>2010-04-29 09:23:39 +0000
commit08a5de860ecd30779db11dbacb263613c1f0ec4d (patch)
treee73dc64202fd0c8013a3600382cfaf9958f433c9 /profiles/base
parentRaise libsoundtouch depend to 1.5.0 wrt #317729 by John. (diff)
downloadhistorical-08a5de860ecd30779db11dbacb263613c1f0ec4d.tar.gz
historical-08a5de860ecd30779db11dbacb263613c1f0ec4d.tar.bz2
historical-08a5de860ecd30779db11dbacb263613c1f0ec4d.zip
Add XTABLES_ADDONS as discussed in -dev on 18.01.2010 (but dropped _MODULES part to make it shorter).
Diffstat (limited to 'profiles/base')
-rw-r--r--profiles/base/ChangeLog6
-rw-r--r--profiles/base/make.defaults8
2 files changed, 11 insertions, 3 deletions
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index 1c71f4fe040d..48e6ad103f7b 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for Gentoo base-profile
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.139 2010/04/13 16:43:55 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.140 2010/04/29 09:23:39 pva Exp $
+
+ 29 Apr 2010; Peter Volkov <pva@gentoo.org> make.defaults:
+ Add XTABLES_ADDONS as discussed in -dev on 18.01.2010 (but dropped
+ _MODULES part to make it shorter).
13 Apr 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
package.use.mask:
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 4797889ff823..848d8e39d997 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,13 +1,13 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.50 2010/03/07 10:00:48 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.51 2010/04/29 09:23:39 pva Exp $
#
# System-wide defaults for the Portage system
# See portage(5) manpage
# Env vars to expand into USE vars. Modifying this requires prior
# discussion on gentoo-dev@gentoo.org.
-USE_EXPAND="APACHE2_MODULES APACHE2_MPMS FOO2ZJS_DEVICES MISDN_CARDS FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS DVB_CARDS LIRC_DEVICES INPUT_DEVICES LINGUAS USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ALSA_CARDS ALSA_PCM_PLUGINS LCD_DEVICES CAMERAS NETBEANS_MODULES QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS SANE_BACKENDS RUBY_TARGETS NGINX_MODULES_HTTP NGINX_MODULES_MAIL"
+USE_EXPAND="APACHE2_MODULES APACHE2_MPMS FOO2ZJS_DEVICES MISDN_CARDS FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS DVB_CARDS LIRC_DEVICES INPUT_DEVICES LINGUAS USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ALSA_CARDS ALSA_PCM_PLUGINS LCD_DEVICES CAMERAS NETBEANS_MODULES QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS SANE_BACKENDS RUBY_TARGETS NGINX_MODULES_HTTP NGINX_MODULES_MAIL XTABLES_ADDONS"
# USE_EXPAND variables whose contents are not shown in package manager
# output. Changes need discussion on gentoo-dev.
@@ -34,6 +34,10 @@ ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file hoo
# Sane defaults for built-in apache modules
APACHE2_MODULES="actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias"
+# Peter Volkov <pva@gentoo.org> (29 Apr 2010)
+# Set some defaults or package will fail to build (Check mconfig in package sources)
+XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark dhcpmac delude chaos account"
+
# Robert Buchholz <rbu@gentoo.org> (17 Jan 2006)
# Some common lcd devices
LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text"