app-admin/rsyslog: Removed old.

Package-Manager: portage-2.2.27
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

7 files changed, 0 insertions, 248 deletions

diff --git a/app-admin/rsyslog/files/8-stable/10-respect_CFLAGS-r1.patch b/app-admin/rsyslog/files/8-stable/10-respect_CFLAGS-r1.patch
deleted file mode 100644
index de89e6708c1f..000000000000
--- a/app-admin/rsyslog/files/8-stable/10-respect_CFLAGS-r1.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index bebb399..5003f10 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -792,8 +792,8 @@ if test "x$enable_rsyslogrt" = "xyes"; then
- fi
- AM_CONDITIONAL(ENABLE_RSYSLOGRT, test x$enable_rsyslogrt = xyes)
- RSRT_CFLAGS="\$(RSRT_CFLAGS1) \$(LIBESTR_CFLAGS) \$(JSON_C_CFLAGS)"
--if test "$GCC" = "yes"
--then RSRT_CFLAGS="$RSRT_CFLAGS -W -Wall -Wformat-security -Wshadow -Wcast-align -Wpointer-arith -Wmissing-format-attribute -Werror=implicit-function-declaration -g"
-+if test "$GCC" = "yes"; then
-+  RSRT_CFLAGS="$RSRT_CFLAGS -W -Wall -Wformat-security -Wshadow -Wcast-align -Wpointer-arith -Wmissing-format-attribute -Werror=implicit-function-declaration"
- fi
- RSRT_LIBS="\$(RSRT_LIBS1) \$(LIBESTR_LIBS) \$(JSON_C_LIBS)"
- AC_SUBST(RSRT_CFLAGS1)
diff --git a/app-admin/rsyslog/files/8-stable/40-rsyslog-fix-parallel-build-issue-479.patch b/app-admin/rsyslog/files/8-stable/40-rsyslog-fix-parallel-build-issue-479.patch
deleted file mode 100644
index 831e9ed93e60..000000000000
--- a/app-admin/rsyslog/files/8-stable/40-rsyslog-fix-parallel-build-issue-479.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ac3e7d316efee0b7a2b953aebdd3268f2b7c31c5 Mon Sep 17 00:00:00 2001
-From: Thomas D.
-Date: Thu, 13 Aug 2015 17:50:36 +0200
-Fix: Parallel build issue "cannot find ../runtime/.libs/librsyslog.a: No such file or directory" (Fixes #479)
-
-This issue was introduced with commit fb4fd2ddd2f08380ad65a8cafc5f124890b136ad.
----
- runtime/Makefile.am | 1 +
- 1 files changed, 1 insertions(+)
-
-diff --git a/runtime/Makefile.am b/runtime/Makefile.am
-index 1f3e350..d02ed4f 100644
---- a/runtime/Makefile.am
-+++ b/runtime/Makefile.am
-@@ -186,6 +186,7 @@ if ENABLE_LIBGCRYPT
-    libgcry_la_SOURCES = libgcry.c libgcry_common.c libgcry.h
-    libgcry_la_CPPFLAGS = $(RSRT_CFLAGS) $(LIBGCRYPT_CFLAGS)
-    pkglib_LTLIBRARIES += lmcry_gcry.la
-+   lmcry_gcry_la_DEPENDENCIES = librsyslog.la
-    lmcry_gcry_la_SOURCES = lmcry_gcry.c lmcry_gcry.h
-    lmcry_gcry_la_CPPFLAGS = $(RSRT_CFLAGS) $(LIBGCRYPT_CFLAGS)
-    lmcry_gcry_la_LDFLAGS = -module -avoid-version \
--- 
-2.5.0
-
diff --git a/app-admin/rsyslog/files/8-stable/50-rsyslog-add-option-to-disable-valgrind-usage-in-testbench.patch b/app-admin/rsyslog/files/8-stable/50-rsyslog-add-option-to-disable-valgrind-usage-in-testbench.patch
deleted file mode 100644
index 77d7919c6188..000000000000
--- a/app-admin/rsyslog/files/8-stable/50-rsyslog-add-option-to-disable-valgrind-usage-in-testbench.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 2945539d12bbb79c44fd4402e87150b4ec58af25 Mon Sep 17 00:00:00 2001
-From: Thomas D.
-Date: Tue, 24 Mar 2015 02:03:13 +0100
-Subject: [PATCH] Add option to disable valgrind usage in testbench
-
-Temporary workaround for https://github.com/rsyslog/rsyslog/issues/263
-
----
- configure.ac | 27 +++++++++++++++++++++++----
- 1 file changed, 23 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0c72f80..cdfdd25 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -13,10 +13,6 @@ AC_CONFIG_HEADERS([config.h])
- 
- AC_USE_SYSTEM_EXTENSIONS
- 
--# check if valgrind is present
--AC_CHECK_PROG(have_valgrind, [valgrind], [yes])
--AM_CONDITIONAL(HAVE_VALGRIND, test x$have_valgrind = xyes)
--
- # Checks for programs.
- AC_PROG_LEX
- AC_PROG_YACC
-@@ -1125,6 +1121,29 @@ if test "x$enable_testbench" = "xyes"; then
- fi
- 
- 
-+# valgrind-testbench
-+AC_ARG_WITH([valgrind_testbench],
-+        [AS_HELP_STRING([--without-valgrind-testbench], [Don't use valgrind in testbench])]
-+)
-+
-+if test "x$with_valgrind_testbench" != "xno"; then
-+        AC_CHECK_PROG(VALGRIND, [valgrind], [valgrind], [no])
-+
-+        if test "x$enable_testbench" = "xyes" && test "x$VALGRIND" = "xno"; then
-+                if test "x$with_valgrind_testbench" = "xyes"; then
-+                        AC_MSG_ERROR([valgrind is missing but forced with --with-valgrind-testbench. Either install valgrind or remove the option!])
-+                else
-+                        AC_MSG_WARN([valgrind is missing -- testbench won't use valgrind!])
-+                fi
-+        else
-+                AC_MSG_NOTICE([testbench will use valgrind])
-+        fi
-+else
-+	AC_MSG_NOTICE([testbench won't use valgrind due to set --without-valgrind-testbench option])
-+fi
-+AM_CONDITIONAL([HAVE_VALGRIND], [test "x$with_valgrind_testbench" != "xno" && test "x$VALGRIND" != "xno"])
-+
-+
- # settings for the file input module
- AC_ARG_ENABLE(imfile,
-         [AS_HELP_STRING([--enable-imfile],[file input module enabled @<:@default=no@:>@])],
diff --git a/app-admin/rsyslog/files/8-stable/50-rsyslog-fix-size-based-legacy-config-statements.patch b/app-admin/rsyslog/files/8-stable/50-rsyslog-fix-size-based-legacy-config-statements.patch
deleted file mode 100644
index 67a2f0616f32..000000000000
--- a/app-admin/rsyslog/files/8-stable/50-rsyslog-fix-size-based-legacy-config-statements.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 3b7bd0b7a7f0f5f1bf7609bdf34e7d9a32608ea6 Mon Sep 17 00:00:00 2001
-From: Rainer Gerhards <rgerhards@adiscon.com>
-Date: Tue, 17 Mar 2015 11:50:06 +0100
-Subject: [PATCH] bugfix: size-based legacy config statements did not work
- properly
-
-on some platforms they misadressed memory, which could also lead
-to a segfault on startup. The problem is NOT experience on amd686
-in 64bit builds -- that's probably the reason this bug was uncovered
-very late. We assume, it's present in all v8 versions.
-
-Thanks to Michael Biebl for alerting us of it.
-
-closes https://github.com/rsyslog/rsyslog/issues/270
----
- runtime/cfsysline.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/runtime/cfsysline.c b/runtime/cfsysline.c
-index 36d4679..b441a48 100644
---- a/runtime/cfsysline.c
-+++ b/runtime/cfsysline.c
-@@ -161,7 +161,7 @@ static rsRetVal parseIntVal(uchar **pp, int64 *pVal)
-  * param value must be int64!
-  * rgerhards, 2008-01-09
-  */
--static rsRetVal doGetSize(uchar **pp, rsRetVal (*pSetHdlr)(void*, uid_t), void *pVal)
-+static rsRetVal doGetSize(uchar **pp, rsRetVal (*pSetHdlr)(void*, int64), void *pVal)
- {
- 	DEFiRet;
- 	int64 i;
diff --git a/app-admin/rsyslog/files/8-stable/50-rsyslog-run-queue-persist-test-only-once.patch b/app-admin/rsyslog/files/8-stable/50-rsyslog-run-queue-persist-test-only-once.patch
deleted file mode 100644
index d2ded2228983..000000000000
--- a/app-admin/rsyslog/files/8-stable/50-rsyslog-run-queue-persist-test-only-once.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 31a5edc9be63de42f68825ff8e4d683534664a68 Mon Sep 17 00:00:00 2001
-From: Thomas D.
-Date: Sun, 8 Mar 2015 21:05:03 +0100
-Subject: [PATCH] tests: Run queue-persist.sh only once
-
-queue-persist.sh was called twice in Makefile.
----
- tests/Makefile.am | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 7575b84..9824e7e 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -83,7 +83,6 @@ TESTS +=  \
- 	imuxsock_logger_root.sh \
- 	imuxsock_traillf_root.sh \
- 	imuxsock_ccmiddle_root.sh \
--	queue-persist.sh \
- 	discard-rptdmsg.sh \
- 	discard-allmark.sh \
- 	discard.sh \
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog.confd b/app-admin/rsyslog/files/8-stable/rsyslog.confd
deleted file mode 100644
index d8cbe875960a..000000000000
--- a/app-admin/rsyslog/files/8-stable/rsyslog.confd
+++ /dev/null
@@ -1,30 +0,0 @@
-# /etc/conf.d/rsyslog
-
-# Configuration file
-RSYSLOG_CONFIGFILE="/etc/rsyslog.conf"
-
-# PID file
-# If you should ever change this, remember to update
-# "/etc/logrotate.d/rsyslog", too.
-RSYSLOG_PIDFILE="/run/rsyslogd.pid"
-
-# You can use this configuration option to pass additional options to the
-# start-stop-daemon, see start-stop-daemon(8) for more details.
-# Per default we wait 1000ms after we have started the service to ensure
-# that the daemon is really up and running.
-RSYSLOG_SSDARGS="--wait 1000"
-
-# The termination timeout (start-stop-daemon parameter "retry") ensures
-# that the service will be terminated within a given time (60 + 5 seconds
-# per default) when you are stopping the service.
-# You need to increase the value when you are working with a large queue.
-# See http://www.rsyslog.com/doc/queues.html for further information.
-RSYSLOG_TERMTIMEOUT="TERM/60/KILL/5"
-
-
-# Options to rsyslogd
-# See rsyslogd(8) for more details
-# Notes:
-# * Do not specify another PIDFILE but use the variable above to change the location
-# * Do not specify another CONFIGFILE but use the variable above to change the location
-RSYSLOG_OPTS=""
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog.initd b/app-admin/rsyslog/files/8-stable/rsyslog.initd
deleted file mode 100644
index a74f218e6a32..000000000000
--- a/app-admin/rsyslog/files/8-stable/rsyslog.initd
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-RSYSLOG_CONFIGFILE=${RSYSLOG_CONFIGFILE:-"/etc/rsyslog.conf"}
-RSYSLOG_PIDFILE=${RSYSLOG_PIDFILE:-"/run/rsyslogd.pid"}
-
-command="/usr/sbin/rsyslogd"
-command_args="${RSYSLOG_OPTS} -f ${RSYSLOG_CONFIGFILE} -i ${RSYSLOG_PIDFILE}"
-start_stop_daemon_args="${RSYSLOG_SSDARGS}"
-pidfile="${RSYSLOG_PIDFILE}"
-retry="${RSYSLOG_TERMTIMEOUT}"
-
-required_files="${RSYSLOG_CONFIGFILE}"
-
-description="RSYSLOG is the rocket-fast system for log processing (syslog replacement)."
-
-extra_commands="configtest"
-extra_started_commands="rotate"
-
-description_configtest="Run rsyslogd's internal config check."
-
-description_rotate="Sends rsyslogd a signal to re-open its log files."
-
-depend() {
-	need clock hostname localmount
-	provide logger
-}
-
-start_pre() {
-	if [ "${RC_CMD}" != "restart" ]; then
-		configtest || return 1
-	fi
-}
-
-stop_pre() {
-	if [ "${RC_CMD}" = "restart" ]; then
-		configtest || return 1
-	fi
-}
-
-stop_post() {
-	rm -f ${RSYSLOG_PIDFILE}
-}
-
-configtest() {
-	# This will currently only detect fatal errors
-	# See https://github.com/rsyslog/rsyslog/issues/79
-
-	local _test_command="${command} -N 999 -f ${RSYSLOG_CONFIGFILE}"
-	local _retval=0
-
-	ebegin "Checking rsyslogd's configuration"
-	${_test_command} >/dev/null 2>&1
-	_retval=$?
-
-	if [ ${_retval} -ne 0 ]; then
-		${_test_command}
-	fi
-
-	eend ${_retval} "failed, please correct errors above"
-}
-
-rotate() {
-	ebegin "Re-opening rsyslogd logs"
-	start-stop-daemon --signal SIGHUP --pidfile "${RSYSLOG_PIDFILE}"
-	eend $?
-}