This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via 3354f749d7c17b61c92a4ff25c6f1e392200bc39 (commit) from b1839f5421d06660cc701e803d7c85eb7eab51ad (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 3354f749d7c17b61c92a4ff25c6f1e392200bc39 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 26 15:05:13 2011 +0100
rsyslog: New package.
-----------------------------------------------------------------------
Summary of changes: pkgs/rsyslog/patches/rsyslog-5.7.9-systemd.patch | 14 ++++ pkgs/rsyslog/rsyslog.conf | 80 ++++++++++++++++++++++ pkgs/rsyslog/rsyslog.log | 61 ++++++++++++++++ pkgs/{audit/audit.nm => rsyslog/rsyslog.nm} | 68 +++++++++++-------- pkgs/rsyslog/rsyslog.sysconfig | 60 ++++++++++++++++ 5 files changed, 254 insertions(+), 29 deletions(-) create mode 100644 pkgs/rsyslog/patches/rsyslog-5.7.9-systemd.patch create mode 100644 pkgs/rsyslog/rsyslog.conf create mode 100644 pkgs/rsyslog/rsyslog.log copy pkgs/{audit/audit.nm => rsyslog/rsyslog.nm} (56%) create mode 100644 pkgs/rsyslog/rsyslog.sysconfig
Difference in files: diff --git a/pkgs/rsyslog/patches/rsyslog-5.7.9-systemd.patch b/pkgs/rsyslog/patches/rsyslog-5.7.9-systemd.patch new file mode 100644 index 0000000..1049c31 --- /dev/null +++ b/pkgs/rsyslog/patches/rsyslog-5.7.9-systemd.patch @@ -0,0 +1,14 @@ +diff -up rsyslog-5.7.9/rsyslog.service.in.orig rsyslog-5.7.9/rsyslog.service.in +--- rsyslog-5.7.9/rsyslog.service.in.orig 2011-03-18 18:05:58.760693398 +0100 ++++ rsyslog-5.7.9/rsyslog.service.in 2011-03-18 18:07:20.131691458 +0100 +@@ -2,8 +2,9 @@ + Description=System Logging Service + + [Service] ++EnvironmentFile=-/etc/sysconfig/rsyslog + ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service +-ExecStart=@sbindir@/rsyslogd -n -c5 ++ExecStart=@sbindir@/rsyslogd -n $SYSLOGD_OPTIONS + Sockets=syslog.socket + + [Install] diff --git a/pkgs/rsyslog/rsyslog.conf b/pkgs/rsyslog/rsyslog.conf new file mode 100644 index 0000000..36cea98 --- /dev/null +++ b/pkgs/rsyslog/rsyslog.conf @@ -0,0 +1,80 @@ +# rsyslog v5 configuration file + +# For more information see /usr/share/doc/rsyslog-*/rsyslog_conf.html +# If you experience problems, see http://www.rsyslog.com/doc/troubleshoot.html + +#### MODULES #### + +$ModLoad imuxsock # provides support for local system logging (e.g. via logger command) +$ModLoad imklog # provides kernel logging support (previously done by rklogd) +#$ModLoad immark # provides --MARK-- message capability + +# Provides UDP syslog reception +#$ModLoad imudp +#$UDPServerRun 514 + +# Provides TCP syslog reception +#$ModLoad imtcp +#$InputTCPServerRun 514 + + +#### GLOBAL DIRECTIVES #### + +# Use default timestamp format +$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat + +# File syncing capability is disabled by default. This feature is usually not required, +# not useful and an extreme performance hit +#$ActionFileEnableSync on + +# Include all config files in /etc/rsyslog.d/ +$IncludeConfig /etc/rsyslog.d/*.conf + + +#### RULES #### + +# Log all kernel messages to the console. +# Logging much else clutters up the screen. +#kern.* /dev/console + +# Log anything (except mail) of level info or higher. +# Don't log private authentication messages! +*.info;mail.none;authpriv.none;cron.none /var/log/messages + +# The authpriv file has restricted access. +authpriv.* /var/log/secure + +# Log all the mail messages in one place. +mail.* -/var/log/maillog + + +# Log cron stuff +cron.* /var/log/cron + +# Everybody gets emergency messages +*.emerg * + +# Save news errors of level crit and higher in a special file. +uucp,news.crit /var/log/spooler + +# Save boot messages also to boot.log +local7.* /var/log/boot.log + + +# ### begin forwarding rule ### +# The statement between the begin ... end define a SINGLE forwarding +# rule. They belong together, do NOT split them. If you create multiple +# forwarding rules, duplicate the whole block! +# Remote Logging (we use TCP for reliable delivery) +# +# An on-disk queue is created for this action. If the remote host is +# down, messages are spooled to disk and sent when it is up again. +#$WorkDirectory /var/lib/rsyslog # where to place spool files +#$ActionQueueFileName fwdRule1 # unique name prefix for spool files +#$ActionQueueMaxDiskSpace 1g # 1gb space limit (use as much as possible) +#$ActionQueueSaveOnShutdown on # save messages to disk on shutdown +#$ActionQueueType LinkedList # run asynchronously +#$ActionResumeRetryCount -1 # infinite retries if host is down +# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional +#*.* @@remote-host:514 +# ### end of the forwarding rule ### diff --git a/pkgs/rsyslog/rsyslog.log b/pkgs/rsyslog/rsyslog.log new file mode 100644 index 0000000..777a666 --- /dev/null +++ b/pkgs/rsyslog/rsyslog.log @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US"> +<!-- git web interface version 1.7.0.2, (C) 2005-2006, Kay Sievers <kay.sievers@vrfy.org>, Christian Gierke --> +<!-- git core binaries version 1.7.2.1 --> +<head> +<meta http-equiv="content-type" content="text/html; charset=utf-8"/> +<meta name="generator" content="gitweb/1.7.0.2 git/1.7.2.1"/> +<meta name="robots" content="index, nofollow"/> +<title>Fedora Packages Git Repositories - rsyslog.git/blob - rsyslog.log</title> +<link rel="stylesheet" type="text/css" href="/gitweb/gitweb.css"/> +<link rel="alternate" title="rsyslog.git - history of rsyslog.log - RSS feed" href="/gitweb/?p=rsyslog.git;a=rss;f=rsyslog.log" type="application/rss+xml" /> +<link rel="alternate" title="rsyslog.git - history of rsyslog.log - RSS feed (no merges)" href="/gitweb/?p=rsyslog.git;a=rss;f=rsyslog.log;opt=--no-merges" type="application/rss+xml" /> +<link rel="alternate" title="rsyslog.git - history of rsyslog.log - Atom feed" href="/gitweb/?p=rsyslog.git;a=atom;f=rsyslog.log;opt=--no-merges" type="application/atom+xml" /> +<link rel="alternate" title="rsyslog.git - history of rsyslog.log - Atom feed (no merges)" href="/gitweb/?p=rsyslog.git;a=atom;f=rsyslog.log;opt=--no-merges" type="application/atom+xml" /> +<link rel="shortcut icon" href="http://fedoraproject.org/static/images/favicon.ico" type="image/png" /> +</head> +<body> +<div class="page_header"> +<a title="Fedora" href="http://fedoraproject.org"><img src="http://fedoraproject.org/static/images/fedora-logo-27.png" width="72" height="27" alt="git" class="logo"/></a><a href="/gitweb/">git://pkgs.fedoraproject.org</a> / <a href="/gitweb/?p=rsyslog.git;a=summary">rsyslog.git</a> / blob +</div> +<form method="get" action="/gitweb/" enctype="application/x-www-form-urlencoded"> +<div class="search"> +<input name="p" type="hidden" value="rsyslog.git" /> +<input name="a" type="hidden" value="search" /> +<input name="h" type="hidden" value="HEAD" /> +<select name="st" > +<option selected="selected" value="commit">commit</option> +<option value="grep">grep</option> +<option value="author">author</option> +<option value="committer">committer</option> +<option value="pickaxe">pickaxe</option> +</select><sup><a href="/gitweb/?p=rsyslog.git;a=search_help">?</a></sup> search: +<input type="text" name="s" /> +<span title="Extended regular expression"><label><input type="checkbox" name="sr" value="1" />re</label></span></div> +</form> +</div> +<div class="page_nav"> +<a href="/gitweb/?p=rsyslog.git;a=summary">summary</a> | <a href="/gitweb/?p=rsyslog.git;a=shortlog">shortlog</a> | <a href="/gitweb/?p=rsyslog.git;a=log">log</a> | <a href="/gitweb/?p=rsyslog.git;a=commit;h=HEAD">commit</a> | <a href="/gitweb/?p=rsyslog.git;a=commitdiff;h=HEAD">commitdiff</a> | <a href="/gitweb/?p=rsyslog.git;a=tree;h=4d7fc435d7037ee9c5baa895bb8d4cc3da575400;hb=HEAD">tree</a><br/> +<a href="/gitweb/?p=rsyslog.git;a=history;f=rsyslog.log;h=b2d41f1806519021802c46d7d74c3d9ccb36c031;hb=HEAD">history</a> | <a href="/gitweb/?p=rsyslog.git;a=blob_plain;f=rsyslog.log;h=b2d41f1806519021802c46d7d74c3d9ccb36c031;hb=HEAD">raw</a> | <a href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.log;hb=HEAD">HEAD</a><br/> +</div> +<div class="header"> +<a class="title" href="/gitweb/?p=rsyslog.git;a=commit;h=HEAD">rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)</a> +</div> +<div class="page_path"><a title="tree root" href="/gitweb/?p=rsyslog.git;a=tree;hb=HEAD">[rsyslog.git]</a> / <a title="rsyslog.log" href="/gitweb/?p=rsyslog.git;a=blob_plain;f=rsyslog.log;hb=HEAD">rsyslog.log</a><br/></div> +<div class="page_body"> +<div class="pre"><a id="l1" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.log;h=b2d41f1806519021802c46d7d74c3d9ccb36c031;hb=HEAD#l1" class="linenr"> 1</a> /var/log/messages /var/log/secure /var/log/maillog /var/log/spooler /var/log/boot.log /var/log/cron {</div> +<div class="pre"><a id="l2" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.log;h=b2d41f1806519021802c46d7d74c3d9ccb36c031;hb=HEAD#l2" class="linenr"> 2</a> sharedscripts</div> +<div class="pre"><a id="l3" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.log;h=b2d41f1806519021802c46d7d74c3d9ccb36c031;hb=HEAD#l3" class="linenr"> 3</a> postrotate</div> +<div class="pre"><a id="l4" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.log;h=b2d41f1806519021802c46d7d74c3d9ccb36c031;hb=HEAD#l4" class="linenr"> 4</a> /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true</div> +<div class="pre"><a id="l5" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.log;h=b2d41f1806519021802c46d7d74c3d9ccb36c031;hb=HEAD#l5" class="linenr"> 5</a> endscript</div> +<div class="pre"><a id="l6" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.log;h=b2d41f1806519021802c46d7d74c3d9ccb36c031;hb=HEAD#l6" class="linenr"> 6</a> }</div> +</div><div class="page_footer"> +<div class="cachetime">Cache Last Updated: Sat Mar 26 12:27:46 2011 GMT</div> +<div class="page_footer_text">rsyslog</div> +<a class="rss_logo" title="history of rsyslog.log RSS feed" href="/gitweb/?p=rsyslog.git;a=rss;f=rsyslog.log">RSS</a> +<a class="rss_logo" title="history of rsyslog.log Atom feed" href="/gitweb/?p=rsyslog.git;a=atom;f=rsyslog.log">Atom</a> +</div> +<script type="text/javascript" src="/gitweb/gitweb.js"></script> +</body> +</html> \ No newline at end of file diff --git a/pkgs/rsyslog/rsyslog.nm b/pkgs/rsyslog/rsyslog.nm new file mode 100644 index 0000000..05c645e --- /dev/null +++ b/pkgs/rsyslog/rsyslog.nm @@ -0,0 +1,82 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, 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, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = rsyslog +PKG_VER = 5.7.9 +PKG_REL = 1 + +PKG_MAINTAINER = +PKG_GROUPS = System/Daemons +PKG_URL = http://www.rsyslog.com/ +PKG_LICENSE = GPLv3+ +PKG_SUMMARY = Enhanced system logging and kernel message trapping daemon. + +PKG_BUILD_DEPS+= gnutls-devel libgcrypt-devel libnet-devel zlib-devel + +PKG_PROVIDES-rsyslog += syslog +PKG_REQUIRES-rsyslog += logrotate + +define PKG_DESCRIPTION + Rsyslog is an enhanced, multi-threaded syslog daemon. It supports MySQL, + syslog/TCP, RFC 3195, permitted sender lists, filtering on any message part, + and fine grain output format control. It is compatible with stock sysklogd + and can be used as a drop-in replacement. Rsyslog is simple to set up, with + advanced features suitable for enterprise-class, encryption-protected syslog + relay chains. +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +CFLAGS += -DSYSLOGD_PIDNAME="syslogd.pid" + +CONFIGURE_OPTIONS += \ + --exec-prefix= \ + --libdir=/lib \ + --with-systemdsystemunitdir=/lib/systemd/system \ + --disable-static \ + --disable-testbench \ + --enable-gnutls \ + --disable-gssapi-krb5 \ + --enable-imfile \ + --disable-libdbi \ + --enable-mail \ + --disable-mysql \ + --enable-omprog \ + --enable-omudpspoof \ + --enable-omuxsock \ + --disable-pgsql \ + --enable-pmlastmsg \ + --disable-relp \ + --disable-snmp \ + --enable-unlimited-select + +define STAGE_INSTALL_CMDS + -mkdir -pv $(BUILDROOT)/etc/{logrotate.d,rsyslog.d,sysconfig} + + cp -vf $(DIR_SOURCE)/rsyslog.conf $(BUILDROOT)/etc/rsyslog.conf + cp -vf $(DIR_SOURCE)/rsyslog.sysconfig $(BUILDROOT)/etc/sysconfig/rsyslog + cp -vf $(DIR_SOURCE)/rsyslog.log $(BUILDROOT)/etc/logrotate.d/syslog +endef diff --git a/pkgs/rsyslog/rsyslog.sysconfig b/pkgs/rsyslog/rsyslog.sysconfig new file mode 100644 index 0000000..0eca916 --- /dev/null +++ b/pkgs/rsyslog/rsyslog.sysconfig @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US"> +<!-- git web interface version 1.7.0.2, (C) 2005-2006, Kay Sievers <kay.sievers@vrfy.org>, Christian Gierke --> +<!-- git core binaries version 1.7.2.1 --> +<head> +<meta http-equiv="content-type" content="text/html; charset=utf-8"/> +<meta name="generator" content="gitweb/1.7.0.2 git/1.7.2.1"/> +<meta name="robots" content="index, nofollow"/> +<title>Fedora Packages Git Repositories - rsyslog.git/blob - rsyslog.sysconfig</title> +<link rel="stylesheet" type="text/css" href="/gitweb/gitweb.css"/> +<link rel="alternate" title="rsyslog.git - history of rsyslog.sysconfig - RSS feed" href="/gitweb/?p=rsyslog.git;a=rss;f=rsyslog.sysconfig" type="application/rss+xml" /> +<link rel="alternate" title="rsyslog.git - history of rsyslog.sysconfig - RSS feed (no merges)" href="/gitweb/?p=rsyslog.git;a=rss;f=rsyslog.sysconfig;opt=--no-merges" type="application/rss+xml" /> +<link rel="alternate" title="rsyslog.git - history of rsyslog.sysconfig - Atom feed" href="/gitweb/?p=rsyslog.git;a=atom;f=rsyslog.sysconfig;opt=--no-merges" type="application/atom+xml" /> +<link rel="alternate" title="rsyslog.git - history of rsyslog.sysconfig - Atom feed (no merges)" href="/gitweb/?p=rsyslog.git;a=atom;f=rsyslog.sysconfig;opt=--no-merges" type="application/atom+xml" /> +<link rel="shortcut icon" href="http://fedoraproject.org/static/images/favicon.ico" type="image/png" /> +</head> +<body> +<div class="page_header"> +<a title="Fedora" href="http://fedoraproject.org"><img src="http://fedoraproject.org/static/images/fedora-logo-27.png" width="72" height="27" alt="git" class="logo"/></a><a href="/gitweb/">git://pkgs.fedoraproject.org</a> / <a href="/gitweb/?p=rsyslog.git;a=summary">rsyslog.git</a> / blob +</div> +<form method="get" action="/gitweb/" enctype="application/x-www-form-urlencoded"> +<div class="search"> +<input name="p" type="hidden" value="rsyslog.git" /> +<input name="a" type="hidden" value="search" /> +<input name="h" type="hidden" value="HEAD" /> +<select name="st" > +<option selected="selected" value="commit">commit</option> +<option value="grep">grep</option> +<option value="author">author</option> +<option value="committer">committer</option> +<option value="pickaxe">pickaxe</option> +</select><sup><a href="/gitweb/?p=rsyslog.git;a=search_help">?</a></sup> search: +<input type="text" name="s" /> +<span title="Extended regular expression"><label><input type="checkbox" name="sr" value="1" />re</label></span></div> +</form> +</div> +<div class="page_nav"> +<a href="/gitweb/?p=rsyslog.git;a=summary">summary</a> | <a href="/gitweb/?p=rsyslog.git;a=shortlog">shortlog</a> | <a href="/gitweb/?p=rsyslog.git;a=log">log</a> | <a href="/gitweb/?p=rsyslog.git;a=commit;h=HEAD">commit</a> | <a href="/gitweb/?p=rsyslog.git;a=commitdiff;h=HEAD">commitdiff</a> | <a href="/gitweb/?p=rsyslog.git;a=tree;h=4d7fc435d7037ee9c5baa895bb8d4cc3da575400;hb=HEAD">tree</a><br/> +<a href="/gitweb/?p=rsyslog.git;a=history;f=rsyslog.sysconfig;h=ad9723f8bee82e89369f19d66bddf02f8d3738f8;hb=HEAD">history</a> | <a href="/gitweb/?p=rsyslog.git;a=blob_plain;f=rsyslog.sysconfig;h=ad9723f8bee82e89369f19d66bddf02f8d3738f8;hb=HEAD">raw</a> | <a href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.sysconfig;hb=HEAD">HEAD</a><br/> +</div> +<div class="header"> +<a class="title" href="/gitweb/?p=rsyslog.git;a=commit;h=HEAD">rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)</a> +</div> +<div class="page_path"><a title="tree root" href="/gitweb/?p=rsyslog.git;a=tree;hb=HEAD">[rsyslog.git]</a> / <a title="rsyslog.sysconfig" href="/gitweb/?p=rsyslog.git;a=blob_plain;f=rsyslog.sysconfig;hb=HEAD">rsyslog.sysconfig</a><br/></div> +<div class="page_body"> +<div class="pre"><a id="l1" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.sysconfig;h=ad9723f8bee82e89369f19d66bddf02f8d3738f8;hb=HEAD#l1" class="linenr"> 1</a> # Options for rsyslogd</div> +<div class="pre"><a id="l2" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.sysconfig;h=ad9723f8bee82e89369f19d66bddf02f8d3738f8;hb=HEAD#l2" class="linenr"> 2</a> # Syslogd options are deprecated since rsyslog v3.</div> +<div class="pre"><a id="l3" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.sysconfig;h=ad9723f8bee82e89369f19d66bddf02f8d3738f8;hb=HEAD#l3" class="linenr"> 3</a> # If you want to use them, switch to compatibility mode 2 by "-c 2"</div> +<div class="pre"><a id="l4" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.sysconfig;h=ad9723f8bee82e89369f19d66bddf02f8d3738f8;hb=HEAD#l4" class="linenr"> 4</a> # See rsyslogd(8) for more details</div> +<div class="pre"><a id="l5" href="/gitweb/?p=rsyslog.git;a=blob;f=rsyslog.sysconfig;h=ad9723f8bee82e89369f19d66bddf02f8d3738f8;hb=HEAD#l5" class="linenr"> 5</a> SYSLOGD_OPTIONS="-c 5"</div> +</div><div class="page_footer"> +<div class="cachetime">Cache Last Updated: Sat Mar 26 12:28:03 2011 GMT</div> +<div class="page_footer_text">rsyslog</div> +<a class="rss_logo" title="history of rsyslog.sysconfig RSS feed" href="/gitweb/?p=rsyslog.git;a=rss;f=rsyslog.sysconfig">RSS</a> +<a class="rss_logo" title="history of rsyslog.sysconfig Atom feed" href="/gitweb/?p=rsyslog.git;a=atom;f=rsyslog.sysconfig">Atom</a> +</div> +<script type="text/javascript" src="/gitweb/gitweb.js"></script> +</body> +</html> \ No newline at end of file
hooks/post-receive -- IPFire 3.x development tree