Current state

diff --git a/.etckeeper b/.etckeeper
index 3a726a810cc0d225aa70a7fb4155201f3ed32a53..12fc9d5aeb1dde46e81c0efe37bcaf0e0ce64d66 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -522,10 +522,14 @@ maybe chmod 0644 './config-archive/etc/php/fpm-php5.3/ext/apc.ini.dist'
 maybe chmod 0644 './config-archive/etc/php/fpm-php5.3/php.ini'
 maybe chmod 0644 './config-archive/etc/php/fpm-php5.3/php.ini.dist'
 maybe chmod 0755 './config-archive/etc/portage'
+maybe chmod 0644 './config-archive/etc/portage/make.conf'
+maybe chmod 0644 './config-archive/etc/portage/make.conf.dist'
 maybe chmod 0644 './config-archive/etc/portage/package.keywords'
 maybe chmod 0644 './config-archive/etc/portage/package.keywords.dist'
 maybe chmod 0644 './config-archive/etc/portage/package.use'
 maybe chmod 0644 './config-archive/etc/portage/package.use.dist'
+maybe chmod 0755 './config-archive/etc/portage/repos.conf'
+maybe chmod 0644 './config-archive/etc/portage/repos.conf/gentoo.conf.dist'
 maybe chmod 0755 './config-archive/etc/portage/savedconfig'
 maybe chmod 0755 './config-archive/etc/portage/savedconfig/sys-apps'
 maybe chmod 0644 './config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19.3-r1'
@@ -1403,6 +1407,8 @@ maybe chmod 0644 './portage/package.unmask'
 maybe chmod 0644 './portage/package.use'
 maybe chmod 0755 './portage/postsync.d'
 maybe chmod 0644 './portage/postsync.d/q-reinitialize'
+maybe chmod 0755 './portage/repos.conf'
+maybe chmod 0644 './portage/repos.conf/gentoo.conf'
 maybe chmod 0755 './portage/savedconfig'
 maybe chmod 0755 './portage/savedconfig/sys-apps'
 maybe chmod 0644 './portage/savedconfig/sys-apps/busybox-1.20.2'

diff --git a/config-archive/etc/portage/make.conf b/config-archive/etc/portage/make.conf
new file mode 100644 (file)
index 0000000..59cf115
--- /dev/null
+++ b/config-archive/etc/portage/make.conf
@@ -0,0 +1,79 @@
+# These settings were set by the catalyst build script that automatically
+# built this stage.
+# Please consult /usr/share/portage/config/make.conf.example for a more
+# detailed example.
+CFLAGS="-O2 -pipe"
+CXXFLAGS="${CFLAGS}"
+# WARNING: Changing your CHOST is not something that should be done lightly.
+# Please consult http://www.gentoo.org/doc/en/change-chost.xml before changing.
+CHOST="x86_64-pc-linux-gnu"
+
+MAKEOPTS="-j3"
+#MAKEOPTS="-j1"
+
+PORTDIR_OVERLAY="/usr/local/portage"
+
+PORTAGE_NICENESS=3
+AUTOCLEAN="yes"
+
+ACCEPT_LICENSE=" \
+       DOOM3 \
+       PUEL \
+       RTCW \
+       RTCW-ETEULA \
+       dlj-1.1 \
+       sun-bcla-java-vm \
+       AdobeFlash-10 \
+       AdobeFlash-10.1 \
+       skype-eula \
+"
+
+EMERGE_DEFAULT_OPTS="--with-bdeps y --quiet-build=y --jobs=4 --load-average=10"
+#EMERGE_DEFAULT_OPTS="--with-bdeps y"
+
+FEATURES="parallel-fetch userpriv usersandbox"
+
+#FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp -P \${DISTDIR} \${URI}"
+#FETCHCOMMAND="mv -v \${DISTDIR}/.old/\${FILE} \${DISTDIR}/"
+
+GENTOO_MIRRORS="http://de-mirror.org/gentoo/ ftp://de-mirror.org/gentoo/ http://gentoo.mneisen.org/"
+
+#LINGUAS="ar bg cs da de el en en_GB en_US es es_ES es_MX fi fr fr_CA fy it ja he hsb hu la nn nn_NO no nds nl oc pl pt pt_BR pt_PT ru sv sv_SE tr uk vi zh_CN zh_HK zh_TW"
+LINGUAS="de en en_GB en_US ru vi"
+
+APACHE2_MPMS="prefork"
+APACHE2_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon 
+                 authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default
+                 authz_groupfile authz_host authz_owner authz_user autoindex cache
+                 cern_meta cgi cgid charset_lite dav dav_fs dav_lock dbd deflate dir
+                 disk_cache dumpio env expires ext_filter file_cache filter headers
+                 ident imagemap include info log_config log_forensic logio mem_cache
+                 mime mime_magic negotiation proxy proxy_ajp proxy_balancer
+                 proxy_connect proxy_ftp proxy_http rewrite setenvif so speling
+                 status substitute unique_id userdir usertrack version vhost_alias
+"
+
+ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file hooks \
+                  iec958 ioplug ladspa lfloat linear meter mmap_emul mulaw multi null \
+                  plug rate route share shm softvol"
+
+PHP_TARGETS="php5-3"
+
+I_KNOW_WHAT_I_AM_DOING=yes
+
+# These are the USE flags that were used in addition to what is provided by the
+# profile used for building.
+#USE="mmx sse sse2"
+
+USE="3dnow X acl apache2 audit bash-completion bazaar bzip2 caps cgi cvs curl \
+     djvu doc examples expat fam fastcgi fontconfig ftp gd geoip gif git gmp gnome-keyring \
+     gnutls gpg gpm graphviz gs gsl gsm gtk guile hscolour html i18n icu idn imagemagick imap ipv6 ithreads \
+     jadetex java javascript jbig jpeg jpeg2k json kerberos lasi ldap libwww lua \
+     lzma lzo maildir mailwrapper mercurial mmx mmxext modperl modplug motif mp3 mysql \
+     nis nss numpy odbc ogg openexr openldap openssl pam pch pcre pdf perl pic png php postgres postscript python rar samba sasl \
+     session smtp snmp soap spamassassin speex spell sqlite sqlite3 sse sse2 ssh \
+     subversion svg syslog theora tiff tk truetype unicode vhosts vim-syntax \
+     vorbis wmf x264 xattr xml xmlrpc xpm xsl xslt xvid zlib
+     -development"
+
+source /var/lib/layman/make.conf

diff --git a/config-archive/etc/portage/make.conf.dist b/config-archive/etc/portage/make.conf.dist
new file mode 100644 (file)
index 0000000..e76fdfd
--- /dev/null
+++ b/config-archive/etc/portage/make.conf.dist
@@ -0,0 +1,85 @@
+# These settings were set by the catalyst build script that automatically
+# built this stage.
+# Please consult /usr/share/portage/config/make.conf.example for a more
+# detailed example.
+CFLAGS="-O2 -pipe"
+CXXFLAGS="${CFLAGS}"
+# WARNING: Changing your CHOST is not something that should be done lightly.
+# Please consult http://www.gentoo.org/doc/en/change-chost.xml before changing.
+CHOST="x86_64-pc-linux-gnu"
+
+MAKEOPTS="-j3"
+#MAKEOPTS="-j1"
+
+PORTDIR_OVERLAY="/usr/local/portage"
+
+PORTAGE_NICENESS=3
+AUTOCLEAN="yes"
+
+ACCEPT_LICENSE=" \
+       DOOM3 \
+       PUEL \
+       RTCW \
+       RTCW-ETEULA \
+       dlj-1.1 \
+       sun-bcla-java-vm \
+       AdobeFlash-10 \
+       AdobeFlash-10.1 \
+       skype-eula \
+"
+
+EMERGE_DEFAULT_OPTS="--with-bdeps y --quiet-build=y --jobs=4 --load-average=10"
+#EMERGE_DEFAULT_OPTS="--with-bdeps y"
+
+FEATURES="parallel-fetch userpriv usersandbox"
+
+#FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp -P \${DISTDIR} \${URI}"
+#FETCHCOMMAND="mv -v \${DISTDIR}/.old/\${FILE} \${DISTDIR}/"
+
+GENTOO_MIRRORS="http://de-mirror.org/gentoo/ ftp://de-mirror.org/gentoo/ http://gentoo.mneisen.org/"
+
+#LINGUAS="ar bg cs da de el en en_GB en_US es es_ES es_MX fi fr fr_CA fy it ja he hsb hu la nn nn_NO no nds nl oc pl pt pt_BR pt_PT ru sv sv_SE tr uk vi zh_CN zh_HK zh_TW"
+LINGUAS="de en en_GB en_US ru vi"
+
+APACHE2_MPMS="prefork"
+APACHE2_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon 
+                 authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default
+                 authz_groupfile authz_host authz_owner authz_user autoindex cache
+                 cern_meta cgi cgid charset_lite dav dav_fs dav_lock dbd deflate dir
+                 disk_cache dumpio env expires ext_filter file_cache filter headers
+                 ident imagemap include info log_config log_forensic logio mem_cache
+                 mime mime_magic negotiation proxy proxy_ajp proxy_balancer
+                 proxy_connect proxy_ftp proxy_http rewrite setenvif so speling
+                 status substitute unique_id userdir usertrack version vhost_alias
+"
+
+ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file hooks \
+                  iec958 ioplug ladspa lfloat linear meter mmap_emul mulaw multi null \
+                  plug rate route share shm softvol"
+
+PHP_TARGETS="php5-3"
+
+I_KNOW_WHAT_I_AM_DOING=yes
+
+# These are the USE flags that were used in addition to what is provided by the
+# profile used for building.
+#USE="mmx sse sse2"
+
+USE="3dnow X acl apache2 audit bash-completion bazaar bzip2 caps cgi cvs curl \
+     djvu doc examples expat fam fastcgi fontconfig ftp gd geoip gif git gmp gnome-keyring \
+     gnutls gpg gpm graphviz gs gsl gsm gtk guile hscolour html i18n icu idn imagemagick imap ipv6 ithreads \
+     jadetex java javascript jbig jpeg jpeg2k json kerberos lasi ldap libwww lua \
+     lzma lzo maildir mailwrapper mercurial mmx mmxext modperl modplug motif mp3 mysql \
+     nis nss numpy odbc ogg openexr openldap openssl pam pch pcre pdf perl pic png php postgres postscript python rar samba sasl \
+     session smtp snmp soap spamassassin speex spell sqlite sqlite3 sse sse2 ssh \
+     subversion svg syslog theora tiff tk truetype unicode vhosts vim-syntax \
+     vorbis wmf x264 xattr xml xmlrpc xpm xsl xslt xvid zlib
+     -development"
+
+source /var/lib/layman/make.conf
+
+# Set PORTDIR for backward compatibility with various tools:
+#   gentoo-bashcomp - bug #478444
+#   euse - bug #474574
+#   euses and ufed - bug #478318
+PORTDIR="/usr/portage"

diff --git a/config-archive/etc/portage/repos.conf/gentoo.conf.dist b/config-archive/etc/portage/repos.conf/gentoo.conf.dist
new file mode 100644 (file)
index 0000000..8c657da
--- /dev/null
+++ b/config-archive/etc/portage/repos.conf/gentoo.conf.dist
@@ -0,0 +1,7 @@
+[DEFAULT]
+main-repo = gentoo
+
+[gentoo]
+location = /usr/portage
+sync-type = rsync
+sync-uri = rsync://rsync.gentoo.org/gentoo-portage

diff --git a/portage/make.conf b/portage/make.conf
index 59cf1156a1c4723774313027ad85151c2b96dd98..e76fdfde5a5bcd4dac2207e301e960f7c64f1c2e 100644 (file)
--- a/portage/make.conf
+++ b/portage/make.conf
@@ -77,3 +77,9 @@ USE="3dnow X acl apache2 audit bash-completion bazaar bzip2 caps cgi cvs curl \
      -development"
 
 source /var/lib/layman/make.conf
+
+# Set PORTDIR for backward compatibility with various tools:
+#   gentoo-bashcomp - bug #478444
+#   euse - bug #474574
+#   euses and ufed - bug #478318
+PORTDIR="/usr/portage"

diff --git a/portage/package.use b/portage/package.use
index 55004eb54df476a0312154ce7a01cf9c66a33d9b..e53cd4d7bb9506042f6652ea17b84e318044e76a 100644 (file)
--- a/portage/package.use
+++ b/portage/package.use
@@ -67,10 +67,12 @@ dev-php/PEAR-MDB2                       mysqli
 dev-php/pecl-apc                       lock_pthreadmutex
 
 dev-python/ipython                     smp
-dev-python/pycairo                      -doc
-dev-python/pygobject                    libffi
+dev-python/pb-base                     -doc
+dev-python/pb-logging                  -doc
+dev-python/pycairo                     -doc
+dev-python/pygobject                   libffi
 
-dev-ruby/rubygems                       server
+dev-ruby/rubygems                      server
 
 dev-scheme/guile                       discouraged networking regex
 

diff --git a/portage/repos.conf/gentoo.conf b/portage/repos.conf/gentoo.conf
new file mode 100644 (file)
index 0000000..8c657da
--- /dev/null
+++ b/portage/repos.conf/gentoo.conf
@@ -0,0 +1,7 @@
+[DEFAULT]
+main-repo = gentoo
+
+[gentoo]
+location = /usr/portage
+sync-type = rsync
+sync-uri = rsync://rsync.gentoo.org/gentoo-portage

diff --git a/rkhunter.conf b/rkhunter.conf
index b8a261682ec26c41faa1608b93ba5362ebd2c3bb..51e4f4be74429556068b9d177e966cc3f3226a2a 100644 (file)
--- a/rkhunter.conf
+++ b/rkhunter.conf
@@ -139,6 +139,7 @@ SCRIPTDIR=/usr/lib/rkhunter/scripts
 #       rkhunter --lang en --list languages
 #
 #LANGUAGE=en
+LANGUAGE=de
 
 #
 # This option is a space-separated list of the languages that are to
@@ -163,7 +164,7 @@ LOGFILE=/var/log/rkhunter.log
 # Set the following option to 1 if the log file is to be appended to
 # whenever rkhunter is run.
 #
-APPEND_LOG=0
+APPEND_LOG=1
 
 #
 # Set the following option to 1 if the log file is to be copied when
@@ -215,7 +216,7 @@ WHITELISTED_IS_WHITE=0
 # file, then a value here of 'unset' can be used to avoid warning messages.
 # This option has a default value of 'no'.
 #
-ALLOW_SSH_ROOT_USER=no
+ALLOW_SSH_ROOT_USER=yes
 
 #
 # Set this option to '1' to allow the use of the SSH-1 protocol, but note