Current state

diff --git a/.etckeeper b/.etckeeper
index e69a8eaf4fe19e3ef1dbbbecfad78fc6d87f1383..5704ecd6a234c326c1926eafba2f378ba1851825 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -169,7 +169,6 @@ maybe chmod 0644 './conf.d/crypto-loop'
 maybe chmod 0644 './conf.d/device-mapper'
 maybe chmod 0644 './conf.d/dmesg'
 maybe chmod 0644 './conf.d/fsck'
-maybe chmod 0644 './conf.d/gem_server'
 maybe chmod 0644 './conf.d/git-daemon'
 maybe chmod 0644 './conf.d/gpm'
 maybe chmod 0644 './conf.d/hostname'
@@ -738,7 +737,6 @@ maybe chmod 0644 './env.d/04gcc-x86_64-pc-linux-gnu'
 maybe chmod 0644 './env.d/05binutils'
 maybe chmod 0644 './env.d/09sandbox'
 maybe chmod 0644 './env.d/10bind'
-maybe chmod 0644 './env.d/10rubygems'
 maybe chmod 0644 './env.d/20java-config'
 maybe chmod 0644 './env.d/20php5.3'
 maybe chmod 0644 './env.d/20php5.5'
@@ -946,7 +944,6 @@ maybe chmod 0755 './init.d/dmesg'
 maybe chmod 0755 './init.d/dmeventd'
 maybe chmod 0755 './init.d/fancontrol'
 maybe chmod 0755 './init.d/fsck'
-maybe chmod 0755 './init.d/gem_server'
 maybe chmod 0755 './init.d/git-daemon'
 maybe chmod 0755 './init.d/gpm'
 maybe chmod 0755 './init.d/hostname'

diff --git a/conf.d/gem_server b/conf.d/gem_server
deleted file mode 100644 (file)
index b9cfa3f..0000000
--- a/conf.d/gem_server
+++ /dev/null
@@ -1,5 +0,0 @@
-# /etc/conf.d/gem_server
-
-# See `gem_server --help` for more
-
-GEM_SERVER_OPTS=""

diff --git a/csh.env b/csh.env
index fdee83f7a436aee0cd9d339aa6004275478d39ee..b5a11b7afdefccdb46905267ff2bf21a4ebe4506 100644 (file)
--- a/csh.env
+++ b/csh.env
@@ -32,6 +32,5 @@ setenv PRELINK_PATH_MASK '/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr
 setenv PYTHONDOCS_2_7 '/usr/share/doc/python-docs-2.7.3/html/library'
 setenv PYTHONDOCS_3_3 '/usr/share/doc/python-docs-3.3.2/html/library'
 setenv ROOTPATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.7.3:/usr/lib64/subversion/bin'
-setenv RUBYOPT '-rauto_gem'
 setenv XDG_CONFIG_DIRS '/etc/xdg'
 setenv XDG_DATA_DIRS '/usr/local/share:/usr/share'

diff --git a/dhcpcd.conf b/dhcpcd.conf
index eb625a70cbe835cac5afd9b9ec5d1cf12647839f..96eaf523c4d161a677d44a44b1a9418bc572616a 100644 (file)
--- a/dhcpcd.conf
+++ b/dhcpcd.conf
@@ -3,10 +3,20 @@
 
 # Inform the DHCP server of our hostname for DDNS.
 hostname
-# To share the DHCP lease across OSX and Windows a ClientID is needed.
-# Enabling this may get a different lease than the kernel DHCP client.
-# Some upstream DHCP servers may also require a ClientID, such as FRITZ!Box.
+
+# Use the hardware address of the interface for the Client ID.
 #clientid
+# or
+# Use the same DUID + IAID as set in DHCPv6 for DHCPv4 ClientID as per RFC4361.
+duid
+
+# Persist interface configuration when dhcpcd exits.
+persistent
+
+# Rapid commit support.
+# Safe to enable by default because it requires the equivalent option set
+# on the server to actually work.
+option rapid_commit
 
 # A list of options to request from the DHCP server.
 option domain_name_servers, domain_name, domain_search, host_name
@@ -14,7 +24,9 @@ option classless_static_routes
 # Most distributions have NTP support.
 option ntp_servers
 # Respect the network MTU.
-option interface_mtu
+# Some interface drivers reset when changing the MTU so disabled by default.
+#option interface_mtu
+
 # A ServerID is required by RFC2131.
 require dhcp_server_identifier
 

diff --git a/env.d/10rubygems b/env.d/10rubygems
deleted file mode 100644 (file)
index f512216..0000000
--- a/env.d/10rubygems
+++ /dev/null
@@ -1 +0,0 @@
-RUBYOPT="-rauto_gem"

diff --git a/init.d/gem_server b/init.d/gem_server
deleted file mode 100755 (executable)
index 49af383..0000000
--- a/init.d/gem_server
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-PID=/var/run/gem_server.pid
-
-depend() {
-       need localmount net
-}
-
-start() {
-       ebegin "Starting gem_server"
-       start-stop-daemon --start --chuid nobody --quiet --background --make-pidfile \
-                --pidfile ${PID} --exec /usr/bin/ruby -- /usr/bin/gem server ${GEM_SERVER_OPTS}
-       eend ${?}
-}
-
-stop() {
-       ebegin "Stopping gem_server"
-       start-stop-daemon --stop --pidfile ${PID}
-       eend ${?}
-}

diff --git a/portage/package.use b/portage/package.use
index 8596a5836a8c4471e5c390c6a1c53c07b37f1919..d1ea5ae9b56182d4f94780696edcfd4b70384578 100644 (file)
--- a/portage/package.use
+++ b/portage/package.use
@@ -128,6 +128,7 @@ media-video/ffmpeg                      aac aacplus amr ass dirac gsm hardcoded-
 net-analyzer/nrpe                       command-args
 net-analyzer/nagios-plugins             nagios-dns nagios-ntp nagios-ping nagios-ssh smart sudo
 net-analyzer/net-snmp                   diskio elf extensible lm_sensors mfd-rewrites sendmail smux
+net-analyzer/pb-nagios-plugins         nrpe
 net-analyzer/tcpdump                   -samba
 net-analyzer/wireshark                  adns gcrypt geoip profile smi
 

diff --git a/profile.env b/profile.env
index 3604cab0a88a8f8f7b2b037f78ae928ec7b20e02..b877395c21026adef55567cd5d774632d56cd201 100644 (file)
--- a/profile.env
+++ b/profile.env
@@ -32,6 +32,5 @@ export PRELINK_PATH_MASK='/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr
 export PYTHONDOCS_2_7='/usr/share/doc/python-docs-2.7.3/html/library'
 export PYTHONDOCS_3_3='/usr/share/doc/python-docs-3.3.2/html/library'
 export ROOTPATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.7.3:/usr/lib64/subversion/bin'
-export RUBYOPT='-rauto_gem'
 export XDG_CONFIG_DIRS='/etc/xdg'
 export XDG_DATA_DIRS='/usr/local/share:/usr/share'

diff --git a/sgml/catalog b/sgml/catalog
index 8254d9afeb88d3bc4906bba1648770d9987d0e3d..a86f4142cc9032976b7f71ba729d05d2d1d4c527 100644 (file)
--- a/sgml/catalog
+++ b/sgml/catalog
@@ -7,5 +7,5 @@ CATALOG "/etc/sgml/xml-docbook-4.2.cat"
 CATALOG "/etc/sgml/xml-docbook-4.3.cat"
 CATALOG "/etc/sgml/xml-docbook-4.4.cat"
 CATALOG "/etc/sgml/xml-docbook-4.5.cat"
-CATALOG "/etc/sgml/openjade-1.3.2.cat"
 CATALOG "/etc/sgml/linuxdoc.cat"
+CATALOG "/etc/sgml/openjade-1.3.2.cat"