saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index c55523c547c196a9903bebd51562963f0af570ee..f807193c57229667130e0f9e3be30c32efe818d4 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -3140,27 +3140,39 @@ maybe chmod 0644 'xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml'
 maybe chmod 0644 'xdg/xfce4/xinitrc'
 maybe chmod 0644 'xinetd.conf'
 maybe chmod 0755 'xinetd.d'
+maybe chmod 0644 'xinetd.d/chargen'
 maybe chmod 0644 'xinetd.d/chargen-dgram'
 maybe chmod 0644 'xinetd.d/chargen-stream'
+maybe chmod 0644 'xinetd.d/chargen-udp'
 maybe chmod 0644 'xinetd.d/cups-lpd'
+maybe chmod 0644 'xinetd.d/daytime'
 maybe chmod 0644 'xinetd.d/daytime-dgram'
 maybe chmod 0644 'xinetd.d/daytime-stream'
+maybe chmod 0644 'xinetd.d/daytime-udp'
+maybe chmod 0644 'xinetd.d/discard'
 maybe chmod 0644 'xinetd.d/discard-dgram'
 maybe chmod 0644 'xinetd.d/discard-stream'
+maybe chmod 0644 'xinetd.d/discard-udp'
+maybe chmod 0644 'xinetd.d/echo'
 maybe chmod 0644 'xinetd.d/echo-dgram'
 maybe chmod 0644 'xinetd.d/echo-stream'
+maybe chmod 0644 'xinetd.d/echo-udp'
 maybe chmod 0644 'xinetd.d/fingerd'
 maybe chmod 0644 'xinetd.d/ftp-sensor'
 maybe chmod 0644 'xinetd.d/git-daemon'
 maybe chmod 0644 'xinetd.d/kpropd'
 maybe chmod 0644 'xinetd.d/rsyncd'
 maybe chmod 0644 'xinetd.d/saned'
+maybe chmod 0644 'xinetd.d/servers'
+maybe chmod 0644 'xinetd.d/services'
 maybe chmod 0644 'xinetd.d/svnserve'
 maybe chmod 0644 'xinetd.d/swat'
 maybe chmod 0644 'xinetd.d/tcpmux-server'
 maybe chmod 0644 'xinetd.d/telnetd'
+maybe chmod 0644 'xinetd.d/time'
 maybe chmod 0644 'xinetd.d/time-dgram'
 maybe chmod 0644 'xinetd.d/time-stream'
+maybe chmod 0644 'xinetd.d/time-udp'
 maybe chmod 0755 'xml'
 maybe chmod 0644 'xml/.keep'
 maybe chmod 0644 'xml/.keep_app-text_docbook-xml-dtd-4.1.2'

diff --git a/init.d/xinetd b/init.d/xinetd
index 7a4a395f2556afca73c83a894c58bd41b2419fd1..613f5dd4875c7702cdc5a133aeefb8123dc7eea5 100755 (executable)
--- a/init.d/xinetd
+++ b/init.d/xinetd
@@ -1,7 +1,6 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the BSD License
-# $Id$
 
 extra_started_commands="reload dump check"
 

diff --git a/xinetd.conf b/xinetd.conf
index 870650801f46ae2b1f3e6da4e8ec2d84a9c7a36b..faed2df2bcea0a24a2d69a4f94be902dd2665d32 100644 (file)
--- a/xinetd.conf
+++ b/xinetd.conf
@@ -13,20 +13,31 @@ defaults
 #      enabled         =
 #      disabled        =
 
+# Previous default in SUSE - please don't forget to use the logrotate. The
+# sample configuration is in /usr/share/packages/doc/xinetd/logrotate
+#       log_type        = FILE /var/log/xinetd.log
+
 # Define general logging characteristics.
        log_type        = SYSLOG daemon info 
-       log_on_failure  = HOST
-       log_on_success  = PID HOST DURATION EXIT
+       log_on_failure  = HOST ATTEMPT
+       log_on_success  = HOST EXIT DURATION
 
 # Define access restriction defaults
 #
 #      no_access       =
-       only_from       = localhost
+#      only_from       = localhost
 #      max_load        = 0
        cps             = 50 10
-       instances       = 50
+       instances       = 30
        per_source      = 10
 
+#
+# The specification of an interface is interesting, if we are on a firewall.
+# For example, if you only want to provide services from an internal
+# network interface, you may specify your internal interfaces IP-Address.
+#
+#      bind    = 127.0.0.1
+
 # Address and networking defaults
 #
 #      bind            =
@@ -35,7 +46,7 @@ defaults
 
 # setup environmental attributes
 #
-       passenv         =
+#      passenv         =
        groups          = yes
        umask           = 002
 

diff --git a/xinetd.d/chargen b/xinetd.d/chargen
new file mode 100644 (file)
index 0000000..596fc88
--- /dev/null
+++ b/xinetd.d/chargen
@@ -0,0 +1,13 @@
+# default: off
+# description: A chargen server. This is the tcp version.
+
+service chargen
+{
+       type            = INTERNAL
+       id              = chargen-stream
+       socket_type     = stream
+       protocol        = tcp
+       user            = root
+       wait            = no
+       disable         = yes
+}                                                                               

diff --git a/xinetd.d/chargen-udp b/xinetd.d/chargen-udp
new file mode 100644 (file)
index 0000000..190d497
--- /dev/null
+++ b/xinetd.d/chargen-udp
@@ -0,0 +1,14 @@
+# default: off
+# description: A chargen server. This is the udp version.
+
+service chargen
+{
+       type            = INTERNAL UNLISTED
+       id              = chargen-dgram
+       socket_type     = dgram
+       protocol        = udp
+       user            = root
+       wait            = yes
+       disable         = yes
+       port            = 19
+}                                                                               

diff --git a/xinetd.d/daytime b/xinetd.d/daytime
new file mode 100644 (file)
index 0000000..ffc50ca
--- /dev/null
+++ b/xinetd.d/daytime
@@ -0,0 +1,13 @@
+# default: off
+# description: A daytime server. This is the tcp version.
+
+service daytime
+{
+       type            = INTERNAL
+       id              = daytime-stream
+       socket_type     = stream
+       protocol        = tcp
+       user            = root
+       wait            = no
+       disable         = yes
+}                                                                               

diff --git a/xinetd.d/daytime-udp b/xinetd.d/daytime-udp
new file mode 100644 (file)
index 0000000..0fc0929
--- /dev/null
+++ b/xinetd.d/daytime-udp
@@ -0,0 +1,14 @@
+# default: off
+# description: A daytime server. This is the udp version.
+
+service daytime
+{
+       type            = INTERNAL UNLISTED
+       id              = daytime-dgram
+       socket_type     = dgram
+       protocol        = udp
+       user            = root
+       wait            = yes
+       disable         = yes
+       port            = 13
+}                                                                               

diff --git a/xinetd.d/discard b/xinetd.d/discard
new file mode 100644 (file)
index 0000000..99a97bd
--- /dev/null
+++ b/xinetd.d/discard
@@ -0,0 +1,13 @@
+# default: off
+# description: A discard server. This is the tcp version.
+
+service discard
+{
+       type            = INTERNAL
+       id              = discard-stream
+       socket_type     = stream
+       protocol        = tcp
+       user            = root
+       wait            = no
+       disable         = yes
+}                                                                               

diff --git a/xinetd.d/discard-udp b/xinetd.d/discard-udp
new file mode 100644 (file)
index 0000000..7f3f7e8
--- /dev/null
+++ b/xinetd.d/discard-udp
@@ -0,0 +1,14 @@
+# default: off
+# description: A discard server. This is the udp version.
+
+service discard
+{
+       type            = INTERNAL UNLISTED
+       id              = discard-dgram
+       socket_type     = dgram
+       protocol        = udp
+       user            = root
+       wait            = yes
+       disable         = yes
+       port            = 9
+}                                                                               

diff --git a/xinetd.d/echo b/xinetd.d/echo
new file mode 100644 (file)
index 0000000..8aa2f74
--- /dev/null
+++ b/xinetd.d/echo
@@ -0,0 +1,13 @@
+# default: off
+# description: An echo server. This is the tcp version.
+
+service echo
+{
+       type            = INTERNAL
+       id              = echo-stream
+       socket_type     = stream
+       protocol        = tcp
+       user            = root
+       wait            = no
+       disable         = yes
+}                                                                               

diff --git a/xinetd.d/echo-udp b/xinetd.d/echo-udp
new file mode 100644 (file)
index 0000000..aca66ef
--- /dev/null
+++ b/xinetd.d/echo-udp
@@ -0,0 +1,14 @@
+# default: off
+# description: An echo server. This is the udp version.
+
+service echo
+{
+       type            = INTERNAL UNLISTED
+       id              = echo-dgram
+       socket_type     = dgram
+       protocol        = udp
+       user            = root
+       wait            = yes
+       disable         = yes
+       port            = 7
+}                                                                               

diff --git a/xinetd.d/servers b/xinetd.d/servers
new file mode 100644 (file)
index 0000000..5f9bb2e
--- /dev/null
+++ b/xinetd.d/servers
@@ -0,0 +1,13 @@
+# default: off
+# description: An internal xinetd service, listing active servers.
+
+service servers
+{
+       type            = INTERNAL UNLISTED
+       port            = 9099
+       socket_type     = stream
+       protocol        = tcp
+       wait            = no
+       disable         = yes
+       only_from       = 127.0.0.1
+}                                                                               

diff --git a/xinetd.d/services b/xinetd.d/services
new file mode 100644 (file)
index 0000000..5797073
--- /dev/null
+++ b/xinetd.d/services
@@ -0,0 +1,13 @@
+# default: off
+# description: An internal xinetd service, listing active services.
+
+service services
+{
+       type            = INTERNAL UNLISTED
+       port            = 9098
+       socket_type     = stream
+       protocol        = tcp
+       wait            = no
+       disable         = yes
+       only_from       = 127.0.0.1
+}                                                                               

diff --git a/xinetd.d/time b/xinetd.d/time
new file mode 100644 (file)
index 0000000..9bdae7e
--- /dev/null
+++ b/xinetd.d/time
@@ -0,0 +1,14 @@
+# default: off
+# description: An RFC 868 time server. This is the tcp version,
+# which is used by rdate.
+
+service time
+{
+       type            = INTERNAL
+       id              = time-stream
+       socket_type     = stream
+       protocol        = tcp
+       user            = root
+       wait            = no
+       disable         = yes
+}                                                                               

diff --git a/xinetd.d/time-udp b/xinetd.d/time-udp
new file mode 100644 (file)
index 0000000..8db32b2
--- /dev/null
+++ b/xinetd.d/time-udp
@@ -0,0 +1,14 @@
+# default: off
+# description: An RFC 868 time server. This is the udp version.
+
+service time
+{
+       type            = INTERNAL UNLISTED
+       id              = time-dgram
+       socket_type     = dgram
+       protocol        = udp
+       user            = root
+       wait            = yes
+       disable         = yes
+       port            = 37
+}