saving uncommitted changes in /etc prior to emerge run

diff --git a/gentoo-release b/gentoo-release
index e19f985e9918d4b5600569898e28f3672b9c9d32..5f0944f7d9a7490f8318527ecc91f2a998b2725b 100644 (file)
--- a/gentoo-release
+++ b/gentoo-release
@@ -1 +1 @@
-Gentoo Base System release 2.2
+Gentoo Base System release 2.3

diff --git a/inputrc b/inputrc
index 2afc0b87f633227c07609c3ef8823acd82bc4b78..a1d7a256dca1491ea31f507bb2deeff27bd47a17 100644 (file)
--- a/inputrc
+++ b/inputrc
@@ -11,6 +11,12 @@
 #  The readline entry to make this skip back a word will then be:
 #    "\e[1;3D" backward-word
 #
+# Customization note:
+#  You don't need to put all your changes in this file.  You can create
+#  ~/.inputrc which starts off with the line:
+#    $include /etc/inputrc
+#  Then put all your own stuff after that.
+#
 
 # do not bell on tab-completion
 #set bell-style none
@@ -54,6 +60,9 @@ $if mode=emacs
 "\e[1;3C": forward-word
 "\e[1;3D": backward-word
 
+# Chromebooks remap alt + backspace so provide alternative (alt + k)
+"\ek": backward-kill-word
+
 $if term=rxvt
 "\e[8~": end-of-line
 $endif

diff --git a/os-release b/os-release
index 44ff8fbdc11acfc0f026fdb48591f5c192277ce8..2a75fec6a7a59d639ffe95d6a0ba0285cb408e2b 100644 (file)
--- a/os-release
+++ b/os-release
@@ -2,6 +2,6 @@ NAME=Gentoo
 ID=gentoo
 PRETTY_NAME="Gentoo/Linux"
 ANSI_COLOR="1;32"
-HOME_URL="http://www.gentoo.org/"
-SUPPORT_URL="http://www.gentoo.org/main/en/support.xml"
+HOME_URL="https://www.gentoo.org/"
+SUPPORT_URL="https://www.gentoo.org/support/"
 BUG_REPORT_URL="https://bugs.gentoo.org/"

diff --git a/profile b/profile
index 2dee46390a44d377c86b0d2c68f1046b3cde408b..e085efa33711fae50438947bf49db3b8684b33e0 100644 (file)
--- a/profile
+++ b/profile
@@ -22,19 +22,15 @@ umask 022
 # There's no real reason to exclude sbin paths from the normal user,
 # but it can make tab-completion easier when they aren't in the
 # user's PATH to pollute the executable namespace.
-#
-# It is intentional in the following line to use || instead of -o.
-# This way the evaluation can be short-circuited and calling whoami is
-# avoided.
-if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then
-       PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${ROOTPATH}"
+if [ "${EUID-}" = "0" ] || [ "${USER-}" = "root" ] ; then
+       PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin${ROOTPATH:+:}${ROOTPATH-}"
 else
-       PATH="/usr/local/bin:/usr/bin:/bin:${PATH}"
+       PATH="/usr/local/bin:/usr/bin:/bin${PATH:+:}${PATH-}"
 fi
 export PATH
 unset ROOTPATH
 
-if [ -n "${BASH_VERSION}" ] ; then
+if [ -n "${BASH_VERSION-}" ] ; then
        # Newer bash ebuilds include /etc/bash/bashrc which will setup PS1
        # including color.  We leave out color here because not all
        # terminals support it.

diff --git a/services b/services
index c16f0ccf9da96fccb75518910c60f926d1fade24..d6b2bb4c5bea06833963bd2095504f989468fb23 100644 (file)
--- a/services
+++ b/services
@@ -701,6 +701,8 @@ concurrent-lm       1648/tcp
 concurrent-lm  1648/udp
 kermit         1649/tcp
 kermit         1649/udp
+groupwise      1677/tcp
+groupwise      1677/udp
 l2tp           1701/tcp
 l2tp           1701/udp
 h323gatedisc   1718/tcp
@@ -755,8 +757,8 @@ x25-svc-port        1998/tcp                        # cisco X.25 service (XOT)
 x25-svc-port   1998/udp
 tcp-id-port    1999/tcp                        # cisco identification port
 tcp-id-port    1999/udp
-cisco-sccp     2000/tcp        sieve           # Cisco SCCP
-cisco-sccp     2000/udp        sieve
+cisco-sccp     2000/tcp                        # Cisco SCCP
+cisco-sccp     2000/udp
 nfs            2049/tcp                        # Network File System
 nfs            2049/udp
 radsec         2083/tcp                        # Secure Radius Service
@@ -915,6 +917,8 @@ xgrid               4111/tcp                        # Mac OS X Server Xgrid
 xgrid          4111/udp
 bzr            4155/tcp                        # Bazaar Version Control System
 bzr            4155/udp                        # Bazaar version control system
+sieve          4190/tcp                        # ManageSieve Protocol
+sieve          4190/udp
 rwhois         4321/tcp                        # Remote Who Is
 rwhois         4321/udp
 epmd           4369/tcp                        # Erlang Port Mapper Daemon
@@ -1149,9 +1153,12 @@ support          1529/tcp                        # GNATS
 cfinger                2003/tcp        lmtp            # GNU Finger
 ninstall       2150/tcp                        # ninstall service
 ninstall       2150/udp
+gpsd           2947/tcp        gpsd            # GPS Daemon request/response protocol
+gpsd           2947/udp        gpsd            # GPS Daemon request/response protocol
 afbackup       2988/tcp                        # Afbackup system
 afbackup       2988/udp
 fax            4557/tcp                        # FAX transmission service        (old)
+xmpp-bosh   5280/tcp                   # Bidirectional-streams Over Synchronous HTTP (BOSH)
 rplay          5555/tcp                        # RPlay audio service
 rplay          5555/udp
 canna          5680/tcp                        # Canna (Japanese Input)
@@ -1159,6 +1166,7 @@ x11-ssh           6010/tcp        x11-ssh-offset
 x11-ssh                6010/udp        x11-ssh-offset
 ircd           6667/tcp                        # Internet Relay Chat
 ircd           6667/udp
+ircs-u         6697/tcp                        # Internet Relay Chat via TLS/SSL
 jetdirect      9100/tcp                        # HP JetDirect card
 jetdirect      9100/udp
 mandelspawn    9359/udp        mandelbrot      # network mandelbrot

diff --git a/shells b/shells
index 4f60dfa66a4b9a2ee552b5ee2bf05000a5a1c50a..05a36e3a73b3401d8cd44af397787973c08ff8bf 100644 (file)
--- a/shells
+++ b/shells
@@ -1,6 +1,7 @@
 # /etc/shells: valid login shells
 /bin/bash
 /bin/csh
+/bin/dash
 /bin/esh
 /bin/fish
 /bin/ksh

diff --git a/sysctl.conf b/sysctl.conf
index 8ae7ce9dfee17024a361b2a70ffe48c8aba202f6..2f8b3b00065a98a89d136388a476f65273104b0f 100644 (file)
--- a/sysctl.conf
+++ b/sysctl.conf
@@ -16,14 +16,20 @@ net.ipv4.ip_forward = 0
 # Disable ECN
 #net.ipv4.tcp_ecn = 0
 # Enables source route verification
-net.ipv4.conf.default.rp_filter = 1
+#net.ipv4.conf.default.rp_filter = 1
 # Enable reverse path
-net.ipv4.conf.all.rp_filter = 1
+#net.ipv4.conf.all.rp_filter = 1
 
 # Enable SYN cookies (yum!)
 # http://cr.yp.to/syncookies.html
 #net.ipv4.tcp_syncookies = 1
 
+# Enable people in the specified (min, max) group range to send ICMP_ECHO
+# messages (i.e. ping) and receive ICMP_ECHOREPLY responses.  This allows
+# you to run non-suid and non-caps `ping`, but it also means anyone with
+# a gid in this range can send those packets (not just via `ping`).
+#net.ipv4.ping_group_range = 100 100
+
 # Disable source route
 #net.ipv4.conf.all.accept_source_route = 0
 #net.ipv4.conf.default.accept_source_route = 0