committing changes in /etc after emerge run

Package changes:

diff --git a/.etckeeper b/.etckeeper
index 3944610a7a55e8f7015bcd3ea45e0c562e6f25c1..dbe94a3dd5cfed36078ec69c0253cd0711a75441 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -96,7 +96,6 @@ maybe chmod 0644 'conf.d/snmptrapd'
 maybe chmod 0644 'conf.d/sntp'
 maybe chmod 0644 'conf.d/sshd'
 maybe chmod 0644 'conf.d/svnserve'
-maybe chmod 0644 'conf.d/syslog-ng'
 maybe chmod 0644 'conf.d/tcollector'
 maybe chmod 0644 'conf.d/tmpfiles'
 maybe chmod 0644 'conf.d/twistd'
@@ -579,7 +578,6 @@ maybe chmod 0755 'init.d/swapfiles'
 maybe chmod 0755 'init.d/swclock'
 maybe chmod 0755 'init.d/sysctl'
 maybe chmod 0755 'init.d/sysfs'
-maybe chmod 0755 'init.d/syslog-ng'
 maybe chmod 0755 'init.d/sysstat'
 maybe chmod 0755 'init.d/tcollector'
 maybe chmod 0755 'init.d/tcollector.bak'
@@ -971,9 +969,6 @@ maybe chmod 0644 'sysctl.conf'
 maybe chmod 0755 'sysctl.d'
 maybe chmod 0644 'sysctl.d/README'
 maybe chmod 0755 'syslog-ng'
-maybe chmod 0755 'syslog-ng/patterndb.d'
-maybe chmod 0644 'syslog-ng/patterndb.d/.keep_app-admin_syslog-ng-0'
-maybe chmod 0644 'syslog-ng/scl.conf'
 maybe chmod 0644 'syslog-ng/syslog-ng.conf'
 maybe chmod 0644 'sysstat'
 maybe chmod 0644 'sysstat.ioconf'

diff --git a/conf.d/syslog-ng b/conf.d/syslog-ng
deleted file mode 100644 (file)
index 42fa26a..0000000
--- a/conf.d/syslog-ng
+++ /dev/null
@@ -1,42 +0,0 @@
-# Config file for /etc/init.d/syslog-ng
-
-# If you are not using network logging, this entire section should be
-# commented out. Otherwise, choose one of the settings below based on
-# how you are configuring your network.
-#
-# If you are using the net.* scripts to configure your network, you should
-# set rc_need to match the interface through which your logging server
-# can be reached.
-#rc_need="net.eth0"
-#
-# If you are using an interface manager like wicd, dhcpcd in standalone
-# mode, networkmanager, etc to control your interfaces, set rc_need to
-# the name of that service.
-# rc_need="dhcpcd"
-#rc_need="networkmanager"
-#
-# If you are using newnet and configuring your interface statically with
-# the network script, you should use this setting.
-#rc_need="network"
-#
-# You can use this setting, but I do not recommend relying on it.
-#rc_need="net"
-#
-# You may also want to uncomment the following if you are using network
-# logging.
-#rc_use="stunnel"
-
-# For very customized setups these variables can be adjusted as needed
-# but for most situations they should remain commented:
-# SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf
-# SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng
-# SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist
-# SYSLOG_NG_PIDFILE_DIR=/run
-# SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE_DIR}/syslog-ng.pid
-# SYSLOG_NG_GROUP=root
-# SYSLOG_NG_USER=root
-
-# Put any additional options for syslog-ng here.
-# See syslog-ng(8) for more information.
-
-SYSLOG_NG_OPTS=""

diff --git a/init.d/syslog-ng b/init.d/syslog-ng
deleted file mode 100755 (executable)
index 88ca55f..0000000
--- a/init.d/syslog-ng
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf}
-SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng}
-SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE:-${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist}
-SYSLOG_NG_PIDFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/run}
-SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid}
-
-SYSLOG_NG_GROUP=${SYSLOG_NG_GROUP:-root}
-SYSLOG_NG_USER=${SYSLOG_NG_USER:-root}
-
-command="/usr/sbin/syslog-ng"
-command_args="--persist-file \"${SYSLOG_NG_STATEFILE}\" --cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}"
-extra_commands="checkconfig"
-extra_started_commands="reload"
-pidfile="${SYSLOG_NG_PIDFILE}"
-start_stop_daemon_args="--user \"${SYSLOG_NG_USER}\":\"${SYSLOG_NG_GROUP}\""
-description="Syslog-ng is a syslog replacement with advanced filtering features."
-description_checkconfig="Check the configuration file that will be used by \"start\""
-description_reload="Reload the configuration without exiting"
-required_files="${SYSLOG_NG_CONFIGFILE}"
-required_dirs="${SYSLOG_NG_PIDFILE_DIR}"
-
-depend() {
-       use clock
-       need hostname localmount
-       after bootmisc
-       provide logger
-}
-
-checkconfig() {
-       ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})"
-       syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}"
-       eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})"
-}
-
-start_pre() {
-       checkconfig || return 1
-       checkpath \
-               -d \
-               --mode 0700 \
-               --owner "${SYSLOG_NG_USER}:${SYSLOG_NG_GROUP}" \
-               "${SYSLOG_NG_STATEFILE_DIR}"
-}
-
-stop_pre() {
-       [ "$RC_CMD" = restart ] && sleep 1
-       return 0
-}
-
-reload() {
-       checkconfig || return 1
-       ebegin "Reloading configuration and re-opening log files"
-       start-stop-daemon --signal HUP --pidfile "${pidfile}"
-       eend $?
-}

diff --git a/syslog-ng/patterndb.d/.keep_app-admin_syslog-ng-0 b/syslog-ng/patterndb.d/.keep_app-admin_syslog-ng-0
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/syslog-ng/scl.conf b/syslog-ng/scl.conf
deleted file mode 100644 (file)
index c3729ce..0000000
--- a/syslog-ng/scl.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-#############################################################################
-# Copyright (c) 2010-2014 BalaBit IT Ltd, Budapest, Hungary
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 as published
-# by the Free Software Foundation, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#
-# As an additional exemption you are allowed to compile & link against the
-# OpenSSL libraries as published by the OpenSSL project. See the file
-# COPYING for details.
-#
-#############################################################################
-#
-# This file is placed into /etc/syslog-ng in order to make it trivial to
-# include in user written syslog-ng.conf files.  It sets up 'scl-root' and
-# `include-path`, then includes all SCL supplied plugins.
-#
-
-@define scl-root "`syslog-ng-data`/include/scl"
-@define include-path "`include-path`:`syslog-ng-data`/include"
-
-@include 'scl/*/*.conf'