old

(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)

12 files changed, 10 insertions, 693 deletions

diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog
index e3e8896a32e1..a981578e7567 100644
--- a/app-admin/syslog-ng/ChangeLog
+++ b/app-admin/syslog-ng/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/syslog-ng
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.365 2013/11/13 17:29:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.366 2013/11/13 17:31:47 mr_bones_ Exp $
+
+  13 Nov 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/syslog-ng-3.3.5-afsocket.patch, -files/syslog-ng-3.3.5-compile.patch,
+  -files/syslog-ng-3.3.5-gprocess.patch, -files/syslog-ng-3.3.5-include.patch,
+  -files/syslog-ng-3.3.5-threading.patch, -files/syslog-ng-3.3.5-utmpx.patch,
+  -files/syslog-ng.conf.gentoo.3.3, -files/syslog-ng.conf.gentoo.fbsd.3.3,
+  -files/syslog-ng.conf.gentoo.hardened.3.3, -files/syslog-ng.rc6.3.3,
+  -syslog-ng-3.3.5-r1.ebuild:
+  old
 
   13 Nov 2013; Michael Sterrett <mr_bones_@gentoo.org> syslog-ng-3.4.2.ebuild:
   add -j1 so stable users don't encounter the parallel make install bug
diff --git a/app-admin/syslog-ng/files/syslog-ng-3.3.5-afsocket.patch b/app-admin/syslog-ng/files/syslog-ng-3.3.5-afsocket.patch
deleted file mode 100644
index b26497f480f6..000000000000
--- a/app-admin/syslog-ng/files/syslog-ng-3.3.5-afsocket.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From algernon@balabit.hu Fri Apr 20 12:06:44 2012
-Date: Fri, 20 Apr 2012 18:06:31 +0200
-From: Gergely Nagy <algernon@balabit.hu>
-Reply-To: Syslog-ng users' and developers' mailing list <syslog-ng@lists.balabit.hu>
-To: syslog-ng@lists.balabit.hu
-Subject: [syslog-ng] [PATCH] afsocket: Fix unix-dgram initialisation
-
-When initializing an unix-dgram socket, set self->fd to the acquired
-socket FD, so that fds inherited from systemd actually get used and
-polled on.
-
-Signed-off-by: Gergely Nagy <algernon@balabit.hu>
----
- modules/afsocket/afsocket.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/modules/afsocket/afsocket.c b/modules/afsocket/afsocket.c
-index 5b192f4..c1bee5c 100644
---- a/modules/afsocket/afsocket.c
-+++ b/modules/afsocket/afsocket.c
-@@ -679,7 +679,7 @@ afsocket_sd_init(LogPipe *s)
-           if (sock == -1 && !afsocket_open_socket(self->bind_addr, !!(self->flags & AFSOCKET_STREAM), &sock))
-             return self->super.super.optional;
-         }
--      self->fd = -1;
-+      self->fd = sock;
- 
-       if (!self->setup_socket(self, sock))
-         {
--- 
-1.7.9.1
-
-
-______________________________________________________________________________
-Member info: https://lists.balabit.hu/mailman/listinfo/syslog-ng
-Documentation: http://www.balabit.com/support/documentation/?product=syslog-ng
-FAQ: http://www.balabit.com/wiki/syslog-ng-faq
-
diff --git a/app-admin/syslog-ng/files/syslog-ng-3.3.5-compile.patch b/app-admin/syslog-ng/files/syslog-ng-3.3.5-compile.patch
deleted file mode 100644
index a2ad347722d2..000000000000
--- a/app-admin/syslog-ng/files/syslog-ng-3.3.5-compile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./lib/scratch-buffers.c.orig	2012-01-20 17:44:43.871103296 -0500
-+++ ./lib/scratch-buffers.c	2012-01-20 17:44:56.313552034 -0500
-@@ -24,6 +24,7 @@
- 
- #include "tls-support.h"
- #include "scratch-buffers.h"
-+#include "misc.h"
- 
- TLS_BLOCK_START
- {
diff --git a/app-admin/syslog-ng/files/syslog-ng-3.3.5-gprocess.patch b/app-admin/syslog-ng/files/syslog-ng-3.3.5-gprocess.patch
deleted file mode 100644
index 6dc373bf6b61..000000000000
--- a/app-admin/syslog-ng/files/syslog-ng-3.3.5-gprocess.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From algernon@balabit.hu Fri Apr 20 10:34:44 2012
-Date: Fri, 20 Apr 2012 16:34:05 +0200
-From: Gergely Nagy <algernon@balabit.hu>
-Reply-To: Syslog-ng users' and developers' mailing list <syslog-ng@lists.balabit.hu>
-To: syslog-ng@lists.balabit.hu
-Subject: [syslog-ng] [PATCH] lib/gprocess.c: Ignore SIGHUP inside the supervisor.
-
-Reloading syslog-ng's config is often done via a killall -HUP
-syslog-ng command, which also sends a signal to the
-supervisor. However, the supervisor did not handle said signal, thus
-it exited as is the default for it.
-
-To work around this issue, lets ignore SIGHUP inside the supervisor.
-
-Reported-by: Patrick Hemmer
-Signed-off-by: Gergely Nagy <algernon@balabit.hu>
----
- lib/gprocess.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/lib/gprocess.c b/lib/gprocess.c
-index aaefbab..9246d88 100644
---- a/lib/gprocess.c
-+++ b/lib/gprocess.c
-@@ -1110,7 +1110,9 @@ g_process_perform_supervise(void)
-                 g_process_message("Initialization failed but the daemon did not exit, even when forced to, trying to recover; pid='%d'", pid);
-               continue;
-             }
--          
-+
-+          sigignore(SIGHUP);
-+
-           if (process_opts.check_fn && (process_opts.check_period >= 0))
-             {
-               gint i = 1;
--- 
-1.7.9.1
-
-
-______________________________________________________________________________
-Member info: https://lists.balabit.hu/mailman/listinfo/syslog-ng
-Documentation: http://www.balabit.com/support/documentation/?product=syslog-ng
-FAQ: http://www.balabit.com/wiki/syslog-ng-faq
-
diff --git a/app-admin/syslog-ng/files/syslog-ng-3.3.5-include.patch b/app-admin/syslog-ng/files/syslog-ng-3.3.5-include.patch
deleted file mode 100644
index 1769563ef9f0..000000000000
--- a/app-admin/syslog-ng/files/syslog-ng-3.3.5-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/lib/ivykis/modules/iv_event_raw.c 2012-01-29 13:15:33.000000000 +0100
-+++ b/lib/ivykis/modules/iv_event_raw.c 2012-04-30 16:01:17.480317290 +0200
-@@ -37,6 +37,8 @@
- #endif
- #endif
- 
-+#include <sys/eventfd.h>
-+
- #ifndef EFD_NONBLOCK
- #define EFD_NONBLOCK   04000
- #endif
-
diff --git a/app-admin/syslog-ng/files/syslog-ng-3.3.5-threading.patch b/app-admin/syslog-ng/files/syslog-ng-3.3.5-threading.patch
deleted file mode 100644
index bf99ac3246fc..000000000000
--- a/app-admin/syslog-ng/files/syslog-ng-3.3.5-threading.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From c0afec5b46eb3508fd3b1449e37b7e550f7d35e2 Mon Sep 17 00:00:00 2001
-From: Gergely Nagy <algernon@balabit.hu>
-Date: Fri, 08 Jun 2012 15:28:33 +0200
-Subject: dnscache: Fix a memory corruption when destroying the DNS cache
-
-The DNS cache gets destroyed every time a worker thread quits, which
-is fine, as most of the dns cache variables are thread local.
-
-However, dns_cache_hosts is not, it's a global static, and
-dns_cache_destroy() was freeing that aswell.
-
-The solution is to not free dns_cache_hosts when a worker stops, but
-do so when syslog-ng stops. This patch introduces dns_cache_deinit()
-which does just that, and removes the same thing from
-dns_cache_destroy(), which now only touches thread-local variables.
-
-Reported-by: EgonB <egon@local.ee>
-Signed-off-by: Gergely Nagy <algernon@balabit.hu>
----
-diff --git a/lib/dnscache.c b/lib/dnscache.c
-index 49102b7..9cdc2c0 100644
---- a/lib/dnscache.c
-+++ b/lib/dnscache.c
-@@ -361,6 +361,12 @@ dns_cache_destroy(void)
-   cache_last.prev = NULL;
-   persist_first.next = NULL;
-   persist_last.prev = NULL;
-+}
-+
-+void
-+dns_cache_deinit(void)
-+{
-   if (dns_cache_hosts)
-     g_free(dns_cache_hosts);
-+  dns_cache_hosts = NULL;
- }
-diff --git a/lib/dnscache.h b/lib/dnscache.h
-index 8bae5f1..647ba19 100644
---- a/lib/dnscache.h
-+++ b/lib/dnscache.h
-@@ -34,5 +34,6 @@ void dns_cache_store(gboolean persistent, gint family, void *addr, const gchar *
- void dns_cache_set_params(gint cache_size, gint expire, gint expire_failed, const gchar *hosts);
- void dns_cache_init(void);
- void dns_cache_destroy(void);
-+void dns_cache_deinit(void);
- 
- #endif
-diff --git a/lib/mainloop.c b/lib/mainloop.c
-index 1203098..e294fa3 100644
---- a/lib/mainloop.c
-+++ b/lib/mainloop.c
-@@ -585,6 +585,7 @@ main_loop_exit_finish(void)
-   /* deinit the current configuration, as at this point we _know_ that no
-    * threads are running.  This will unregister ivykis tasks and timers
-    * that could fire while the configuration is being destructed */
-+  dns_cache_deinit();
-   cfg_deinit(current_configuration);
-   iv_quit();
- }
---
-cgit v0.8.3.4-1-gaabc
diff --git a/app-admin/syslog-ng/files/syslog-ng-3.3.5-utmpx.patch b/app-admin/syslog-ng/files/syslog-ng-3.3.5-utmpx.patch
deleted file mode 100644
index 1014d7932068..000000000000
--- a/app-admin/syslog-ng/files/syslog-ng-3.3.5-utmpx.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 4b450a09da83bc8e27bd7c8adccea3f125387fa7 Mon Sep 17 00:00:00 2001
-From: Gergely Nagy <algernon@balabit.hu>
-Date: Tue, 5 Jun 2012 14:40:08 +0200
-Subject: [PATCH] afuser: Use utmpx when available, instead of utmp
-
-FreeBSD 9 removed support for utmp, and one must use the
-POSIX-specified utmpx instead. The same utmpx is available on Linux
-too (and it is the same as utmp there).
-
-The patch below converts afuser to use utmpx when available, utmp
-otherwise. It is based on the post-build sed magic applied to
-syslog-ng within the FreeBSD ports collection, with other bits based
-on a patch from Alex Zimnitsky.
-
-Signed-off-by: Gergely Nagy <algernon@balabit.hu>
----
- configure.in            |    4 ++--
- lib/utils.c             |    2 +-
- lib/utils.h             |    7 ++++++-
- modules/afuser/afuser.c |   20 +++++++++++++++++++-
- 4 files changed, 28 insertions(+), 5 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index aafb980..c76d7d9 100644
---- a/configure.in
-+++ b/configure.in
-@@ -383,7 +383,7 @@ dnl ***************************************************************************
- 
- AC_HEADER_STDC
- AC_CHECK_HEADER(dmalloc.h)
--AC_CHECK_HEADERS(strings.h getopt.h stropts.h sys/strlog.h door.h sys/capability.h sys/prctl.h)
-+AC_CHECK_HEADERS(strings.h getopt.h stropts.h sys/strlog.h door.h sys/capability.h sys/prctl.h utmpx.h)
- AC_CHECK_HEADERS(tcpd.h)
- 
- 
-@@ -479,7 +479,7 @@ if test "x$enable_linux_caps" = "xyes" -o "x$enable_linux_caps" = "xauto"; then
- 	AC_CHECK_LIB(cap, cap_set_proc, LIBCAP_LIBS="-lcap")
- fi
- 
--AC_CHECK_FUNCS(strdup strtol strtoll strtoimax inet_aton inet_ntoa getopt_long getaddrinfo getutent pread pwrite strcasestr memrchr localtime_r gmtime_r)
-+AC_CHECK_FUNCS(strdup strtol strtoll strtoimax inet_aton inet_ntoa getopt_long getaddrinfo getutent getutxent pread pwrite strcasestr memrchr localtime_r gmtime_r)
- old_LIBS=$LIBS
- LIBS=$BASE_LIBS
- AC_CHECK_FUNCS(clock_gettime)
-diff --git a/lib/utils.c b/lib/utils.c
-index 2b5c525..3c05426 100644
---- a/lib/utils.c
-+++ b/lib/utils.c
-@@ -47,7 +47,7 @@ int inet_aton(const char *cp, struct in_addr *addr)
- }
- #endif
- 
--#ifndef HAVE_GETUTENT
-+#if !defined(HAVE_GETUTENT) && !defined(HAVE_GETUTXENT)
- 
- static int utent_fd = -1;
- 
-diff --git a/lib/utils.h b/lib/utils.h
-index 86e3a7f..a0f3dcc 100644
---- a/lib/utils.h
-+++ b/lib/utils.h
-@@ -28,13 +28,18 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
-+
-+#ifdef HAVE_UTMPX_H
-+#include <utmpx.h>
-+#else
- #include <utmp.h>
-+#endif
- 
- #ifndef HAVE_INET_ATON
- int inet_aton(const char *cp, struct in_addr *addr);
- #endif
- 
--#ifndef HAVE_GETUTENT
-+#if !defined(HAVE_GETUTENT) && !defined(HAVE_GETUTXENT)
- struct utmp *getutent(void);
- void endutent(void);
- #endif
-diff --git a/modules/afuser/afuser.c b/modules/afuser/afuser.c
-index 8f170e5..7d082b2 100644
---- a/modules/afuser/afuser.c
-+++ b/modules/afuser/afuser.c
-@@ -25,7 +25,13 @@
- #include "alarms.h"
- #include "messages.h"
- 
-+#ifdef HAVE_UTMPX_H
-+#include <utmpx.h>
-+#define ut_name ut_user
-+#else
- #include <utmp.h>
-+#endif
-+
- #include <string.h>
- #include <fcntl.h>
- #include <unistd.h>
-@@ -46,7 +52,11 @@
- {
-   AFUserDestDriver *self = (AFUserDestDriver *) s;
-   gchar buf[8192];
-+#ifdef HAVE_UTMPX_H
-+  struct utmpx *ut;
-+#else
-   struct utmp *ut;
-+#endif
-   GString *timestamp;
-   time_t now;
-   
-@@ -63,7 +73,11 @@
-   g_string_free(timestamp, TRUE);
-   
-   /* NOTE: there's a private implementations of getutent in utils.c on Systems which do not provide one. */
--  while ((ut = getutent())) 
-+#ifdef HAVE_GETUTXENT
-+  while ((ut = getutxent()))
-+#else
-+  while ((ut = getutent()))
-+#endif
-     {
- #if HAVE_MODERN_UTMP
-       if (ut->ut_type == USER_PROCESS &&
-@@ -106,7 +120,11 @@
-             }
-         }
-     }
-+#if HAVE_UTMPX_H
-+  endutxent();
-+#else
-   endutent();
-+#endif
- finish:
-   log_msg_ack(msg, path_options);
-   log_msg_unref(msg);
--- 
-1.7.10
-
diff --git a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.3.3 b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.3.3
deleted file mode 100644
index 2b57fa1d0b0f..000000000000
--- a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.3.3
+++ /dev/null
@@ -1,38 +0,0 @@
-@version: 3.3
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.3.3,v 1.2 2011/10/04 23:15:44 mr_bones_ Exp $
-#
-# Syslog-ng default configuration file for Gentoo Linux
-
-options { 
-	threaded(yes);
-	chain_hostnames(no); 
-
-	# The default action of syslog-ng is to log a STATS line
-	# to the file every 10 minutes.  That's pretty ugly after a while.
-	# Change it to every 12 hours so you get a nice daily update of
-	# how many messages syslog-ng missed (0).
-	stats_freq(43200); 
-	# The default action of syslog-ng is to log a MARK line
-	# to the file every 20 minutes.  That's seems high for most
-	# people so turn it down to once an hour.  Set it to zero
-	# if you don't want the functionality at all.
-	mark_freq(3600); 
-};
-
-source src {
-    unix-stream("/dev/log" max-connections(256));
-    internal();
-    file("/proc/kmsg");
-};
-
-destination messages { file("/var/log/messages"); };
-
-# By default messages are logged to tty12...
-destination console_all { file("/dev/tty12"); };
-# ...if you intend to use /dev/console for programs like xconsole
-# you can comment out the destination line above that references /dev/tty12
-# and uncomment the line below.
-#destination console_all { file("/dev/console"); };
-
-log { source(src); destination(messages); };
-log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.fbsd.3.3 b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.fbsd.3.3
deleted file mode 100644
index bb889b1b8151..000000000000
--- a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.fbsd.3.3
+++ /dev/null
@@ -1,25 +0,0 @@
-@version: 3.3
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.fbsd.3.3,v 1.2 2011/10/04 23:15:44 mr_bones_ Exp $
-#
-# Syslog-ng default configuration file for Gentoo FreeBSD
-#
-options {
-	threaded(yes);
-	chain_hostnames(no);
-
-	# The default action of syslog-ng is to log a STATS line
-	# to the file every 10 minutes.  That's pretty ugly after a while.
-	# Change it to every 12 hours so you get a nice daily update of
-	# how many messages syslog-ng missed (0).
-	stats_freq(43200); 
-};
-
-source src {
-    unix-dgram("/var/run/log");
-    internal();
-    file("/dev/klog");
-};
-
-destination messages { file("/var/log/messages"); };
-
-log { source(src); destination(messages); };
diff --git a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.3.3 b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.3.3
deleted file mode 100644
index 2066a9f9fa89..000000000000
--- a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.3.3
+++ /dev/null
@@ -1,112 +0,0 @@
-@version: 3.3
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.3.3,v 1.2 2011/10/04 23:15:44 mr_bones_ Exp $
-
-#
-# Syslog-ng configuration file, compatible with default hardened installations.
-#
-
-options {
-	threaded(yes);
-	chain_hostnames(no);
-	stats_freq(43200);
-};
-
-source src {
-    unix-stream("/dev/log");
-    internal();
-};
-source kernsrc {
-    file("/proc/kmsg");
-};
-
-#source net { udp(); };
-#log { source(net); destination(net_logs); };
-#destination net_logs { file("/var/log/HOSTS/$HOST/$YEAR$MONTH$DAY.log"); };
-
-destination authlog { file("/var/log/auth.log"); };
-destination _syslog { file("/var/log/syslog"); };
-destination cron { file("/var/log/cron.log"); };
-destination daemon { file("/var/log/daemon.log"); };
-destination kern { file("/var/log/kern.log"); file("/dev/tty12"); };
-destination lpr { file("/var/log/lpr.log"); };
-destination user { file("/var/log/user.log"); };
-destination uucp { file("/var/log/uucp.log"); };
-#destination ppp { file("/var/log/ppp.log"); };
-destination mail { file("/var/log/mail.log"); };
-
-destination avc { file("/var/log/avc.log"); };
-destination audit { file("/var/log/audit.log"); };
-destination pax { file("/var/log/pax.log"); };
-destination grsec { file("/var/log/grsec.log"); };
-
-destination mailinfo { file("/var/log/mail.info"); };
-destination mailwarn { file("/var/log/mail.warn"); };
-destination mailerr { file("/var/log/mail.err"); };
-
-destination newscrit { file("/var/log/news/news.crit"); };
-destination newserr { file("/var/log/news/news.err"); };
-destination newsnotice { file("/var/log/news/news.notice"); };
-
-destination debug { file("/var/log/debug"); };
-destination messages { file("/var/log/messages"); };
-destination console { usertty("root"); };
-destination console_all { file("/dev/tty12"); };
-#destination loghost { udp("loghost" port(999)); };
-
-destination xconsole { pipe("/dev/xconsole"); };
-
-filter f_auth { facility(auth); };
-filter f_authpriv { facility(auth, authpriv); };
-filter f_syslog { not facility(authpriv, mail); };
-filter f_cron { facility(cron); };
-filter f_daemon { facility(daemon); };
-filter f_kern { facility(kern); };
-filter f_lpr { facility(lpr); };
-filter f_mail { facility(mail); };
-filter f_user { facility(user); };
-filter f_uucp { facility(uucp); };
-#filter f_ppp { facility(ppp); };
-filter f_news { facility(news); };
-filter f_debug { not facility(auth, authpriv, news, mail); };
-filter f_messages { level(info..warn)
-	and not facility(auth, authpriv, mail, news); };
-filter f_emergency { level(emerg); };
-
-filter f_info { level(info); };
-
-filter f_notice { level(notice); };
-filter f_warn { level(warn); };
-filter f_crit { level(crit); };
-filter f_err { level(err); };
-
-filter f_avc { message(".*avc: .*"); };
-filter f_audit { message("^(\\[.*\..*\] |)audit.*") and not message(".*avc: .*"); };
-filter f_pax { message("^(\\[.*\..*\] |)PAX:.*"); };
-filter f_grsec { message("^(\\[.*\..*\] |)grsec:.*"); };
-
-log { source(src); filter(f_authpriv); destination(authlog); };
-log { source(src); filter(f_syslog); destination(_syslog); };
-log { source(src); filter(f_cron); destination(cron); };
-log { source(src); filter(f_daemon); destination(daemon); };
-log { source(kernsrc); filter(f_kern); destination(kern); };
-log { source(src); filter(f_lpr); destination(lpr); };
-log { source(src); filter(f_mail); destination(mail); };
-log { source(src); filter(f_user); destination(user); };
-log { source(src); filter(f_uucp); destination(uucp); };
-log { source(kernsrc); filter(f_pax); destination(pax); };
-log { source(kernsrc); filter(f_grsec); destination(grsec); };
-log { source(kernsrc); filter(f_audit); destination(audit); };
-log { source(kernsrc); filter(f_avc); destination(avc); };
-log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); };
-log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); };
-log { source(src); filter(f_mail); filter(f_err); destination(mailerr); };
-log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
-log { source(src); filter(f_news); filter(f_err); destination(newserr); };
-log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
-log { source(src); filter(f_debug); destination(debug); };
-log { source(src); filter(f_messages); destination(messages); };
-log { source(src); filter(f_emergency); destination(console); };
-#log { source(src); filter(f_ppp); destination(ppp); };
-log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/syslog-ng.rc6.3.3 b/app-admin/syslog-ng/files/syslog-ng.rc6.3.3
deleted file mode 100644
index 5b966cb27e4e..000000000000
--- a/app-admin/syslog-ng/files/syslog-ng.rc6.3.3
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.rc6.3.3,v 1.3 2013/04/28 04:50:34 mr_bones_ Exp $
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-description_checkconfig="Check the configuration file that will be used by \"start\""
-description_reload="Reload the configuration without exiting"
-
-SYSLOG_NG_SERVICE=${SVCNAME#*.}
-SYSLOG_NG_SERVICE=${SYSLOG_NG_SERVICE:-syslog-ng}
-
-SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${SYSLOG_NG_SERVICE}.conf}
-SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-/var/run/${SVCNAME}.pid}
-SYSLOG_NG_OPTS="--cfgfile ${SYSLOG_NG_CONFIGFILE} --pidfile ${SYSLOG_NG_PIDFILE} ${SYSLOG_NG_OPTS}"
-
-depend() {
-	# Make networking dependency conditional on configuration
-	if [ -f "${SYSLOG_NG_CONFIGFILE}" ]; then
-		case `sed 's/#.*//' "${SYSLOG_NG_CONFIGFILE}"` in
-			*source*tcp*|*source*udp*|*destination*tcp*|*destination*udp*)
-				need net
-				use stunnel ;;
-		esac
-	fi
-
-	config "${SYSLOG_NG_CONFIGFILE}"
-	use clock
-	need hostname localmount
-	after bootmisc
-	provide logger
-}
-
-checkconfig() {
-	if [ ! -e "${SYSLOG_NG_CONFIGFILE}" ] ; then
-		eerror "You need to create ${SYSLOG_NG_CONFIGFILE} first."
-		eerror "An example can be found in /usr/share/doc/syslog"
-
-		return 1
-	fi
-	syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}"
-
-	# the start and reload functions have their own eends so
-	# avoid calling this twice when there are no problems
-	[ $? -eq 0 ] || eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})"
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting ${SVCNAME}"
-	[ -n "${SYSLOG_NG_OPTS}" ] && SYSLOG_NG_OPTS="-- ${SYSLOG_NG_OPTS}"
-	start-stop-daemon --start --pidfile "${SYSLOG_NG_PIDFILE}" --exec /usr/sbin/syslog-ng ${SYSLOG_NG_OPTS}
-	eend $? "Failed to start ${SVCNAME}"
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --pidfile "${SYSLOG_NG_PIDFILE}"
-	eend $? "Failed to stop ${SVCNAME}"
-	sleep 1 # needed for syslog-ng to stop in case we're restarting
-}
-
-reload() {
-	if [ ! -f "${SYSLOG_NG_PIDFILE}" ]; then
-		eerror "${SVCNAME} isn't running"
-		return 1
-	fi
-	checkconfig || return 1
-	ebegin "Reloading configuration and re-opening log files"
-	start-stop-daemon --signal HUP --pidfile "${SYSLOG_NG_PIDFILE}"
-	eend $?
-}
diff --git a/app-admin/syslog-ng/syslog-ng-3.3.5-r1.ebuild b/app-admin/syslog-ng/syslog-ng-3.3.5-r1.ebuild
deleted file mode 100644
index eb88b9cf5aab..000000000000
--- a/app-admin/syslog-ng/syslog-ng-3.3.5-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.3.5-r1.ebuild,v 1.3 2013/05/08 20:47:41 mr_bones_ Exp $
-
-EAPI=2
-inherit autotools eutils multilib
-
-MY_PV=${PV/_/}
-DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="http://www.balabit.com/products/syslog_ng/"
-SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${MY_PV}/source/syslog-ng_${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="caps hardened ipv6 json mongodb +pcre selinux spoof-source sql ssl static tcpd"
-RESTRICT="test"
-
-LIBS_DEPEND="
-	spoof-source? ( net-libs/libnet )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	!static? (
-		>=dev-libs/eventlog-0.2.12
-		>=dev-libs/glib-2.10.1:2 )
-	json? ( >=dev-libs/json-glib-0.12 )
-	caps? ( sys-libs/libcap )
-	sql? ( >=dev-db/libdbi-0.8.3 )"
-RDEPEND="
-	!static? (
-		pcre? ( dev-libs/libpcre )
-		${LIBS_DEPEND}
-	)"
-DEPEND="${RDEPEND}
-	${LIBS_DEPEND}
-	static? (
-		>=dev-libs/eventlog-0.2.12[static-libs]
-		>=dev-libs/glib-2.10.1:2[static-libs] )
-	virtual/pkgconfig
-	sys-devel/flex"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-compile.patch \
-		"${FILESDIR}"/${P}-afsocket.patch \
-		"${FILESDIR}"/${P}-gprocess.patch \
-		"${FILESDIR}"/${P}-include.patch \
-		"${FILESDIR}"/${P}-threading.patch \
-		"${FILESDIR}"/${P}-utmpx.patch
-	sed -i \
-		-e '/libsyslog_ng_crypto_la_LIBADD/s/$/ -lssl -lcrypto/' \
-		lib/Makefile.am || die
-	sed -i \
-			-e 's/AM_PROG_CC_STDC/AC_PROG_CC/' \
-			-e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \
-			configure.in || die
-	sed -i \
-			-e 's/AM_PROG_CC_STDC/AC_PROG_CC/' \
-			-e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \
-			modules/afmongodb/libmongo-client/configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use static ; then
-		myconf="${myconf} --enable-static-linking"
-	else
-		myconf="${myconf} --enable-dynamic-linking"
-	fi
-	econf \
-		--disable-dependency-tracking \
-		--disable-systemd \
-		--with-ivykis=internal \
-		--sysconfdir=/etc/syslog-ng \
-		--localstatedir=/var/lib/misc \
-		--with-pidfile-dir=/var/run \
-		--with-module-dir=/usr/$(get_libdir)/syslog-ng \
-		$(use_enable caps linux-caps) \
-		$(use_enable ipv6) \
-		$(use_enable json) \
-		$(use_with json json-glib) \
-		$(use_enable mongodb) \
-		$(use_enable pcre) \
-		$(use_enable spoof-source) \
-		$(use_enable sql) \
-		$(use_enable ssl) \
-		$(use_enable tcpd tcp-wrapper) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS \
-		contrib/syslog-ng.conf* \
-		contrib/syslog2ng "${FILESDIR}/syslog-ng.conf."*
-
-	# Install default configuration
-	insinto /etc/syslog-ng
-	if use hardened || use selinux ; then
-		newins "${FILESDIR}/syslog-ng.conf.gentoo.hardened.${PV%.*}" syslog-ng.conf || die
-	elif use userland_BSD ; then
-		newins "${FILESDIR}/syslog-ng.conf.gentoo.fbsd.${PV%.*}" syslog-ng.conf || die
-	else
-		newins "${FILESDIR}/syslog-ng.conf.gentoo.${PV%.*}" syslog-ng.conf || die
-	fi
-
-	insinto /etc/logrotate.d
-	# Install snippet for logrotate, which may or may not be installed
-	if use hardened || use selinux ; then
-		newins "${FILESDIR}/syslog-ng.logrotate.hardened" syslog-ng || die
-	else
-		newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng || die
-	fi
-
-	newinitd "${FILESDIR}/syslog-ng.rc6.${PV%.*}" syslog-ng || die
-	newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng || die
-	keepdir /etc/syslog-ng/patterndb.d
-	find "${D}" -type f -name '*.la' -exec rm {} + || die
-	rmdir "${D}"/usr/libexec
-}
-
-pkg_postinst() {
-	elog "For detailed documentation please see the upstream website:"
-	elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.3-guides/syslog-ng-ose-v3.3-guide-admin-en.html/index.html"
-
-	# bug #355257
-	if ! has_version app-admin/logrotate ; then
-		echo
-		elog "It is highly recommended that app-admin/logrotate be emerged to"
-		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
-		elog "for logrotate to use."
-		echo
-	fi
-}