From 2da29c978ca8750351d43f429c879870a66dc4e3 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Wed, 9 May 2018 11:20:59 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- .etckeeper | 12 ++++++++++++ init.d/xinetd | 3 +-- xinetd.conf | 21 ++++++++++++++++----- xinetd.d/chargen | 13 +++++++++++++ xinetd.d/chargen-udp | 14 ++++++++++++++ xinetd.d/daytime | 13 +++++++++++++ xinetd.d/daytime-udp | 14 ++++++++++++++ xinetd.d/discard | 13 +++++++++++++ xinetd.d/discard-udp | 14 ++++++++++++++ xinetd.d/echo | 13 +++++++++++++ xinetd.d/echo-udp | 14 ++++++++++++++ xinetd.d/servers | 13 +++++++++++++ xinetd.d/services | 13 +++++++++++++ xinetd.d/time | 14 ++++++++++++++ xinetd.d/time-udp | 14 ++++++++++++++ 15 files changed, 191 insertions(+), 7 deletions(-) create mode 100644 xinetd.d/chargen create mode 100644 xinetd.d/chargen-udp create mode 100644 xinetd.d/daytime create mode 100644 xinetd.d/daytime-udp create mode 100644 xinetd.d/discard create mode 100644 xinetd.d/discard-udp create mode 100644 xinetd.d/echo create mode 100644 xinetd.d/echo-udp create mode 100644 xinetd.d/servers create mode 100644 xinetd.d/services create mode 100644 xinetd.d/time create mode 100644 xinetd.d/time-udp diff --git a/.etckeeper b/.etckeeper index c55523c5..f807193c 100755 --- 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 7a4a395f..613f5dd4 100755 --- 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 87065080..faed2df2 100644 --- 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 index 00000000..596fc88a --- /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 index 00000000..190d4973 --- /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 index 00000000..ffc50cac --- /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 index 00000000..0fc09294 --- /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 index 00000000..99a97bd8 --- /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 index 00000000..7f3f7e85 --- /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 index 00000000..8aa2f74e --- /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 index 00000000..aca66efb --- /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 index 00000000..5f9bb2e4 --- /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 index 00000000..57970731 --- /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 index 00000000..9bdae7e2 --- /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 index 00000000..8db32b25 --- /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 +} -- 2.39.5