summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2013-07-11 19:06:26 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2013-07-11 19:06:26 +0000
commitf93ee274f0b821da987a91b2a785fb14d44d36cf (patch)
tree08a2c3824bffdfa791b7b68b609cd2fee4d917e9 /app-admin
parentppc stable, bug 476430 (diff)
downloadgentoo-2-f93ee274f0b821da987a91b2a785fb14d44d36cf.tar.gz
gentoo-2-f93ee274f0b821da987a91b2a785fb14d44d36cf.tar.bz2
gentoo-2-f93ee274f0b821da987a91b2a785fb14d44d36cf.zip
old
(Portage version: 2.1.12.2/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/syslog-ng/ChangeLog7
-rw-r--r--app-admin/syslog-ng/files/3.4/syslog-ng-3.4.1-autotools.patch38
-rw-r--r--app-admin/syslog-ng/files/3.4/syslog-ng-3.4.1-rollup.patch291
-rw-r--r--app-admin/syslog-ng/syslog-ng-3.4.1-r1.ebuild104
4 files changed, 6 insertions, 434 deletions
diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog
index a1cb5ec13071..6f63839a52c7 100644
--- a/app-admin/syslog-ng/ChangeLog
+++ b/app-admin/syslog-ng/ChangeLog
@@ -1,6 +1,11 @@
# 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.352 2013/07/08 15:56:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.353 2013/07/11 19:06:26 mr_bones_ Exp $
+
+ 11 Jul 2013; Michael Sterrett <mr_bones_@gentoo.org>
+ -files/3.4/syslog-ng-3.4.1-autotools.patch,
+ -files/3.4/syslog-ng-3.4.1-rollup.patch, -syslog-ng-3.4.1-r1.ebuild:
+ old
08 Jul 2013; Jeroen Roovers <jer@gentoo.org> syslog-ng-3.4.2.ebuild:
Stable for HPPA (bug #475884).
diff --git a/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.1-autotools.patch b/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.1-autotools.patch
deleted file mode 100644
index c57f9f510473..000000000000
--- a/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.1-autotools.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- syslog-ng-3.4.1.orig/configure.in
-+++ syslog-ng-3.4.1/configure.in
-@@ -68,7 +68,7 @@
- pidfiledir='${localstatedir}'
- moduledir='${exec_prefix}/lib/syslog-ng'
-
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
-
- dnl ***************************************************************************
- dnl Arguments
-@@ -227,7 +227,6 @@
- dnl ***************************************************************************
- dnl Checks for programs.
- AC_PROG_CC
--AM_PROG_CC_STDC
- AC_PROG_CC_C99
- if test "x$ac_cv_prog_cc_c99" = "xno"; then
- AC_MSG_ERROR("C99 standard compliant C compiler required. Try GCC 3.x or later.")
---- syslog-ng-3.4.1.orig/modules/afmongodb/libmongo-client/configure.ac
-+++ syslog-ng-3.4.1/modules/afmongodb/libmongo-client/configure.ac
-@@ -15,7 +15,7 @@
-
- AC_CONFIG_MACRO_DIR([m4])
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
-
- AC_ARG_WITH([versioned-symbols], AC_HELP_STRING([--with-versioned-symbols],[Use versioned symbols]),[dnl
- vsymldflags="-Wl,--version-script,\${srcdir}/libmongo-client.ver -Wl,-O1"
-@@ -24,7 +24,6 @@
- dnl ***************************************************************************
- dnl Checks for programs.
- AC_PROG_CC
--AM_PROG_CC_STDC
- AC_PROG_MAKE_SET
- PKG_PROG_PKG_CONFIG
- LT_INIT([shared])
diff --git a/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.1-rollup.patch b/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.1-rollup.patch
deleted file mode 100644
index 7d68a64eb6b4..000000000000
--- a/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.1-rollup.patch
+++ /dev/null
@@ -1,291 +0,0 @@
---- syslog-ng-3.4.1/contrib/systemd/syslog-ng.service
-+++ syslog-ng-3.4-master/contrib/systemd/syslog-ng.service
-@@ -7,6 +7,7 @@
- ExecStart=/usr/sbin/syslog-ng -F
- ExecReload=/bin/kill -HUP $MAINPID
- StandardOutput=null
-+Restart=on-failure
-
- [Install]
- WantedBy=multi-user.target
---- syslog-ng-3.4.1/lib/cfg-tree.c
-+++ syslog-ng-3.4-master/lib/cfg-tree.c
-@@ -588,6 +588,22 @@
- return FALSE;
- }
-
-+static void
-+cfg_tree_propagate_expr_node_properties_to_pipe(LogExprNode *node, LogPipe *pipe)
-+{
-+ if (node->flags & LC_FALLBACK)
-+ pipe->flags |= PIF_BRANCH_FALLBACK;
-+
-+ if (node->flags & LC_FINAL)
-+ pipe->flags |= PIF_BRANCH_FINAL;
-+
-+ if (node->flags & LC_FLOW_CONTROL)
-+ pipe->flags |= PIF_HARD_FLOW_CONTROL;
-+
-+ if (!pipe->expr_node)
-+ pipe->expr_node = node;
-+}
-+
- /**
- * cfg_tree_compile_sequence:
- *
-@@ -713,10 +729,6 @@
- {
- source_join_pipe = last_pipe = log_pipe_new();
- g_ptr_array_add(self->initialized_pipes, source_join_pipe);
--
-- source_join_pipe->expr_node = node;
-- if (node->flags & LC_FLOW_CONTROL)
-- source_join_pipe->flags |= PIF_HARD_FLOW_CONTROL;
- }
- log_pipe_append(sub_pipe_tail, source_join_pipe);
- }
-@@ -724,16 +736,13 @@
-
- if (first_pipe)
- {
-- if (node->flags & LC_FALLBACK)
-- first_pipe->flags |= PIF_BRANCH_FALLBACK;
--
-- if (node->flags & LC_FINAL)
-- first_pipe->flags |= PIF_BRANCH_FINAL;
--
-- if (node->flags & LC_FLOW_CONTROL)
-- first_pipe->flags |= PIF_HARD_FLOW_CONTROL;
-- if (!first_pipe->expr_node)
-- first_pipe->expr_node = node;
-+ /* we actually return something as sub_pipe_head, which means that we
-+ * have to propagate flags upwards */
-+ cfg_tree_propagate_expr_node_properties_to_pipe(node, first_pipe);
-+ }
-+ else if (last_pipe)
-+ {
-+ cfg_tree_propagate_expr_node_properties_to_pipe(node, last_pipe);
- }
-
-
---- syslog-ng-3.4.1/lib/control.c
-+++ syslog-ng-3.4-master/lib/control.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2002-2012 BalaBit IT Ltd, Budapest, Hungary
-+ * Copyright (c) 2002-2013 BalaBit IT Ltd, Budapest, Hungary
- * Copyright (c) 1998-2012 Balázs Scheidler
- *
- * This library is free software; you can redistribute it and/or
-@@ -208,8 +208,8 @@
- }
- else if (rc == 0)
- {
-- msg_error("EOF on control channel, closing connection",
-- NULL);
-+ msg_notice("EOF on control channel, closing connection",
-+ NULL);
- goto destroy_connection;
- }
- else
---- syslog-ng-3.4.1/lib/filter.c
-+++ syslog-ng-3.4-master/lib/filter.c
-@@ -46,6 +46,12 @@
- self->ref_cnt = 1;
- }
-
-+/*
-+ * In case the filter would modify the message the caller has to make sure
-+ * that the message is writable. You can always archieve that with
-+ * filter_expr_eval_root() below, but you have to be on a processing path to
-+ * do that.
-+ */
- gboolean
- filter_expr_eval_with_context(FilterExprNode *self, LogMessage **msg, gint num_msg)
- {
-@@ -65,6 +71,21 @@
- return filter_expr_eval_with_context(self, &msg, 1);
- }
-
-+gboolean
-+filter_expr_eval_root_with_context(FilterExprNode *self, LogMessage **msg, gint num_msg, const LogPathOptions *path_options)
-+{
-+ if (self->modify)
-+ log_msg_make_writable(&msg[0], path_options);
-+
-+ return filter_expr_eval_with_context(self, msg, num_msg);
-+}
-+
-+gboolean
-+filter_expr_eval_root(FilterExprNode *self, LogMessage **msg, const LogPathOptions *path_options)
-+{
-+ return filter_expr_eval_root_with_context(self, msg, 1, path_options);
-+}
-+
- FilterExprNode *
- filter_expr_ref(FilterExprNode *self)
- {
-@@ -98,6 +119,7 @@
- self->left->init(self->left, cfg);
- if (self->right && self->right->init)
- self->right->init(self->right, cfg);
-+ self->super.modify = self->left->modify || self->right->modify;
- }
-
- static void
-@@ -132,7 +154,6 @@
-
- fop_init_instance(self);
- self->super.eval = fop_or_eval;
-- self->super.modify = e1->modify || e2->modify;
- self->left = e1;
- self->right = e2;
- self->super.type = "OR";
-@@ -154,7 +175,6 @@
-
- fop_init_instance(self);
- self->super.eval = fop_and_eval;
-- self->super.modify = e1->modify || e2->modify;
- self->left = e1;
- self->right = e2;
- self->super.type = "AND";
-@@ -509,6 +529,7 @@
-
-
- self->filter_expr = ((LogFilterPipe *) rule->children->object)->expr;
-+ self->super.modify = self->filter_expr->modify;
- }
- else
- {
-@@ -699,10 +720,8 @@
- evt_tag_str("rule", self->name),
- evt_tag_str("location", log_expr_node_format_location(s->expr_node, buf, sizeof(buf))),
- NULL);
-- if (self->expr->modify)
-- log_msg_make_writable(&msg, path_options);
-
-- res = filter_expr_eval(self->expr, msg);
-+ res = filter_expr_eval_root(self->expr, &msg, path_options);
- msg_debug("Filter rule evaluation result",
- evt_tag_str("result", res ? "match" : "not-match"),
- evt_tag_str("rule", self->name),
---- syslog-ng-3.4.1/lib/filter.h
-+++ syslog-ng-3.4-master/lib/filter.h
-@@ -48,6 +48,8 @@
-
- gboolean filter_expr_eval(FilterExprNode *self, LogMessage *msg);
- gboolean filter_expr_eval_with_context(FilterExprNode *self, LogMessage **msgs, gint num_msg);
-+gboolean filter_expr_eval_root(FilterExprNode *self, LogMessage **msg, const LogPathOptions *path_options);
-+gboolean filter_expr_eval_root_with_context(FilterExprNode *self, LogMessage **msgs, gint num_msg, const LogPathOptions *path_options);
- void filter_expr_unref(FilterExprNode *self);
-
- typedef struct _FilterRE
---- syslog-ng-3.4.1/lib/logmpx.c
-+++ syslog-ng-3.4-master/lib/logmpx.c
-@@ -39,9 +39,15 @@
-
- for (i = 0; i < self->next_hops->len; i++)
- {
-- LogPipe *next_hop = g_ptr_array_index(self->next_hops, i);
-+ LogPipe *branch_head = g_ptr_array_index(self->next_hops, i);
-+ LogPipe *p;
-+
-+ for (p = branch_head; p; p = p->pipe_next)
-+ {
-+ branch_head->flags |= (p->flags & PIF_BRANCH_PROPERTIES);
-+ }
-
-- if ((next_hop->flags & PIF_BRANCH_FALLBACK) != 0)
-+ if (branch_head->flags & PIF_BRANCH_FALLBACK)
- {
- self->fallback_exists = TRUE;
- }
---- syslog-ng-3.4.1/lib/logmsg.h
-+++ syslog-ng-3.4-master/lib/logmsg.h
-@@ -1,6 +1,6 @@
- /*
-- * Copyright (c) 2002-2012 BalaBit IT Ltd, Budapest, Hungary
-- * Copyright (c) 1998-2012 Balázs Scheidler
-+ * Copyright (c) 2002-2013 BalaBit IT Ltd, Budapest, Hungary
-+ * Copyright (c) 1998-2013 Balázs Scheidler
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
-@@ -203,6 +203,12 @@
- gboolean log_msg_is_handle_sdata(NVHandle handle);
- gboolean log_msg_is_handle_match(NVHandle handle);
-
-+static inline gboolean
-+log_msg_is_handle_settable_with_an_indirect_value(NVHandle handle)
-+{
-+ return (handle >= LM_V_MAX);
-+}
-+
- const gchar *log_msg_get_macro_value(LogMessage *self, gint id, gssize *value_len);
-
- static inline const gchar *
---- syslog-ng-3.4.1/lib/logpipe.h
-+++ syslog-ng-3.4-master/lib/logpipe.h
-@@ -47,6 +47,7 @@
- /* log statement flags that are copied to the head of a branch */
- #define PIF_BRANCH_FINAL 0x0004
- #define PIF_BRANCH_FALLBACK 0x0008
-+#define PIF_BRANCH_PROPERTIES (PIF_BRANCH_FINAL + PIF_BRANCH_FALLBACK)
-
- /* branch starting with this pipe wants hard flow control */
- #define PIF_HARD_FLOW_CONTROL 0x0010
---- syslog-ng-3.4.1/lib/logrewrite.c
-+++ syslog-ng-3.4-master/lib/logrewrite.c
-@@ -45,7 +45,7 @@
- gssize length;
- const gchar *value;
-
-- if (self->condition && !filter_expr_eval(self->condition, msg))
-+ if (self->condition && !filter_expr_eval_root(self->condition, &msg, path_options))
- {
- msg_debug("Rewrite condition unmatched, skipping rewrite",
- evt_tag_str("value", log_msg_get_value_name(self->value_handle, NULL)),
---- syslog-ng-3.4.1/lib/persist-state.c
-+++ syslog-ng-3.4-master/lib/persist-state.c
-@@ -26,6 +26,7 @@
- #include "serialize.h"
- #include "messages.h"
- #include "mainloop.h"
-+#include "misc.h"
-
- #include <sys/types.h>
- #include <unistd.h>
-@@ -218,6 +219,7 @@
- NULL);
- return FALSE;
- }
-+ g_fd_set_cloexec(self->fd, TRUE);
- self->current_key_block = offsetof(PersistFileHeader, initial_key_store);
- self->current_key_ofs = 0;
- self->current_key_size = sizeof((((PersistFileHeader *) NULL))->initial_key_store);
---- syslog-ng-3.4.1/modules/dbparser/patterndb.c
-+++ syslog-ng-3.4-master/modules/dbparser/patterndb.c
-@@ -1302,7 +1302,7 @@
- log_msg_set_value(msg, match->handle, match->match, match->len);
- g_free(match->match);
- }
-- else if (ref_handle != LM_V_NONE)
-+ else if (ref_handle != LM_V_NONE && log_msg_is_handle_settable_with_an_indirect_value(match->handle))
- {
- log_msg_set_value_indirect(msg, match->handle, ref_handle, match->type, match->ofs, match->len);
- }
---- syslog-ng-3.4.1/tests/loggen/loggen.c
-+++ syslog-ng-3.4-master/tests/loggen/loggen.c
-@@ -847,6 +847,12 @@
- {
- static struct sockaddr_un saun;
-
-+ if (argc < 1)
-+ {
-+ fprintf(stderr, "No target path specified\n");
-+ return 1;
-+ }
-+
- saun.sun_family = AF_UNIX;
- strncpy(saun.sun_path, argv[0], sizeof(saun.sun_path));
-
diff --git a/app-admin/syslog-ng/syslog-ng-3.4.1-r1.ebuild b/app-admin/syslog-ng/syslog-ng-3.4.1-r1.ebuild
deleted file mode 100644
index 5826d7f962cb..000000000000
--- a/app-admin/syslog-ng/syslog-ng-3.4.1-r1.ebuild
+++ /dev/null
@@ -1,104 +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.4.1-r1.ebuild,v 1.1 2013/06/02 01:18:35 mr_bones_ Exp $
-
-EAPI=5
-inherit autotools eutils multilib systemd
-
-MY_PV=${PV/_/}
-DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="http://www.balabit.com/network-security/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+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="caps dbi geoip ipv6 json mongodb +pcre smtp spoof-source ssl tcpd"
-RESTRICT="test"
-
-RDEPEND="
- pcre? ( dev-libs/libpcre )
- spoof-source? ( net-libs/libnet:1.1 )
- ssl? ( dev-libs/openssl:= )
- smtp? ( net-libs/libesmtp )
- tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
- >=dev-libs/eventlog-0.2.12
- >=dev-libs/glib-2.10.1:2
- json? ( >=dev-libs/json-c-0.9 )
- caps? ( sys-libs/libcap )
- geoip? ( >=dev-libs/geoip-1.5.0 )
- dbi? ( >=dev-db/libdbi-0.8.3 )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- sys-devel/flex"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PV%.*}/${P}-rollup.patch \
- "${FILESDIR}"/${PV%.*}/${P}-autotools.patch
- mv configure.in configure.ac || die
- eautoreconf
-}
-
-src_configure() {
- econf \
- --with-ivykis=internal \
- --with-libmongo-client=internal \
- --sysconfdir=/etc/syslog-ng \
- --localstatedir=/var/lib/syslog-ng \
- --with-pidfile-dir=/var/run \
- --with-module-dir=/usr/$(get_libdir)/syslog-ng \
- $(systemd_with_unitdir) \
- $(use_enable caps linux-caps) \
- $(use_enable geoip) \
- $(use_enable ipv6) \
- $(use_enable json) \
- $(use_enable mongodb) \
- $(use_enable pcre) \
- $(use_enable smtp) \
- $(use_enable spoof-source) \
- $(use_enable dbi sql) \
- $(use_enable ssl) \
- $(use_enable tcpd tcp-wrapper)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- dodoc AUTHORS ChangeLog NEWS contrib/syslog-ng.conf* contrib/syslog2ng \
- "${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo.hardened" \
- "${FILESDIR}/syslog-ng.logrotate.hardened" \
- "${FILESDIR}/README.hardened"
-
- # Install default configuration
- insinto /etc/syslog-ng
- if use userland_BSD ; then
- newins "${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
- else
- newins "${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo" syslog-ng.conf
- fi
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng
-
- newinitd "${FILESDIR}/${PV%.*}/syslog-ng.rc6" syslog-ng
- newconfd "${FILESDIR}/${PV%.*}/syslog-ng.confd" syslog-ng
- keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
- prune_libtool_files --modules
-}
-
-pkg_postinst() {
- elog "For detailed documentation please see the upstream website:"
- elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.4-guides/en/syslog-ng-ose-v3.4-guide-admin/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
-}