ultrabug 14/05/22 11:15:49
Modified: ChangeLog metadata.xml
Added: rsyslog-7.6.3.ebuild
Removed: rsyslog-7.4.3.ebuild rsyslog-7.4.6.ebuild
rsyslog-7.4.7.ebuild
Log:
version bump fix #501988 #501982 #501986 #490744 thx to @Whissi
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
B658FA13)
Revision Changes Path
1.112 app-admin/rsyslog/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/ChangeLog?rev=1.112&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/ChangeLog?rev=1.112&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/ChangeLog?r1=1.111&r2=1.112
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- ChangeLog 16 Apr 2014 16:14:41 -0000 1.111
+++ ChangeLog 22 May 2014 11:15:49 -0000 1.112
@@ -1,6 +1,19 @@
# ChangeLog for app-admin/rsyslog
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.111
2014/04/16 16:14:41 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.112
2014/05/22 11:15:49 ultrabug Exp $
+
+*rsyslog-7.6.3 (22 May 2014)
+
+ 22 May 2014; Ultrabug <[email protected]> -rsyslog-7.4.3.ebuild,
+ -rsyslog-7.4.6.ebuild, -rsyslog-7.4.7.ebuild, +rsyslog-7.6.3.ebuild,
+ +files/7-stable/50-default.conf, +files/7-stable/README.gentoo,
+ +files/7-stable/bugfix_52.patch, +files/7-stable/bugfix_73.patch,
+ +files/7-stable/fix-omruleset-default-value.patch,
+ +files/7-stable/rsyslog.conf, +files/7-stable/rsyslog.confd-r1,
+ +files/7-stable/rsyslog.initd-r1, +files/7-stable/rsyslog.logrotate-r1,
+ metadata.xml:
+ version bump fix #501988 #501982 #501986 #490744 thx to @Whissi, drop old
+ versions
16 Apr 2014; Maxim Koltsov <[email protected]>
+files/7-stable/rsyslog-7.x-mmjsonparse.patch, rsyslog-7.2.7.ebuild,
1.16 app-admin/rsyslog/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/metadata.xml?rev=1.16&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/metadata.xml?rev=1.16&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/metadata.xml?r1=1.15&r2=1.16
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/rsyslog/metadata.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- metadata.xml 10 Mar 2014 13:00:19 -0000 1.15
+++ metadata.xml 22 May 2014 11:15:49 -0000 1.16
@@ -1,23 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
- <maintainer>
- <email>[email protected]</email>
- <name>Ultrabug</name>
- <description>Primary Maintainer</description>
- </maintainer>
- <maintainer>
- <email>[email protected]</email>
- <name>Thomas D. (Whissi)</name>
- <description>Proxy-Maintainer, CC. bugs</description>
- </maintainer>
- <use>
- <flag name="extras">Add support for the UDP spoofing module (omudpspoof)
using <pkg>net-libs/libnet</pkg></flag>
- <flag name="mongodb">Add support for the MongoDB output template module
using <pkg>dev-libs/libmongo-client</pkg></flag>
- <flag name="relp">Add support for the Reliable Event Logging Protocol
using <pkg>dev-libs/librelp</pkg></flag>
- <flag name="zeromq">Add support for the ZeroMQ input and output plugins
using <pkg>net-libs/zeromq</pkg></flag>
- </use>
- <upstream>
- <remote-id type="cpe">cpe:/a:rsyslog:rsyslog</remote-id>
- </upstream>
+ <maintainer>
+ <email>[email protected]</email>
+ <name>Ultrabug</name>
+ <description>Primary Maintainer</description>
+ </maintainer>
+ <maintainer>
+ <email>[email protected]</email>
+ <name>Thomas D. (Whissi)</name>
+ <description>Proxy-Maintainer, CC. bugs</description>
+ </maintainer>
+ <use>
+ <flag name="dbi">Build the general database output module
(requires <pkg>dev-db/libdbi</pkg>)</flag>
+ <flag name="elasticsearch">Build the Elasticsearch output
module (requires <pkg>net-misc/curl</pkg>)</flag>
+ <flag name="extras">Add support for the UDP spoofing module
(omudpspoof) using <pkg>net-libs/libnet</pkg></flag>
+ <flag name="gcrypt">Add support for encrypted log files using
<pkg>dev-libs/libgcrypt</pkg></flag>
+ <flag name="kerberos">Build the GSSAPI input and output module
(requires <pkg>virtual/krb5</pkg>)</flag>
+ <flag name="mongodb">Build the MongoDB output module (requires
<pkg>dev-libs/libmongo-client</pkg>)</flag>
+ <flag name="mysql">Build the MySQL databse output module
(requires <pkg>virtual/mysql</pkg>)</flag>
+ <flag name="normalize">Build the normalize modify module
(requires <pkg>dev-libs/libee</pkg> and <pkg>dev-libs/liblognorm</pkg>)</flag>
+ <flag name="omudpspoof">Build the udpspoof output module
(requires <pkg>net-libs/libnet</pkg>)</flag>
+ <flag name="oracle">Build the Oracle database output module
(requires <pkg>dev-db/oracle-instantclient-basic</pkg>)</flag>
+ <flag name="postgres">Build the PostgreSQL database output
module (requires <pkg>dev-db/postgresql-base</pkg>)</flag>
+ <flag name="rabbitmq">Build the RabbitMQ output module
(requires <pkg>net-libs/rabbitmq-c</pkg>)</flag>
+ <flag name="redis">Build the Redis output module using
(requires <pkg>dev-libs/hiredis</pkg>)</flag>
+ <flag name="relp">Build the Reliable Event Logging Protocol
(RELP) output module (requires <pkg>dev-libs/librelp</pkg>)</flag>
+ <flag name="rfc3195">Build the rfc3195 input module (requires
<pkg>dev-libs/liblogging</pkg>)</flag>
+ <flag name="rfc5424hmac">Build the rfc5424hmac modify module
(requires <pkg>dev-libs/openssl</pkg>)</flag>
+ <flag name="snmp">Build the snmp modify and output module
(requires <pkg>net-analyzer/net-snmp</pkg>)</flag>
+ <flag name="ssl">Add support for encrypted client/server
communication (requires <pkg>net-libs/gnutls</pkg>)</flag>
+ <flag name="systemd">Build the journal input and output module
(requires <pkg>sys-apps/systemd</pkg>)</flag>
+ <flag name="usertools">Installs the user tools (rsgtutil,
rscryutil...) corresponding to the set USE flags</flag>
+ <flag name="zeromq">Build the ZeroMQ input and output modules
(requires <pkg>net-libs/zeromq</pkg>)</flag>
+ </use>
+ <upstream>
+ <bugs-to>https://github.com/rsyslog/rsyslog/issues</bugs-to>
+ <remote-id type="cpe">cpe:/a:rsyslog:rsyslog</remote-id>
+ </upstream>
</pkgmetadata>
1.1 app-admin/rsyslog/rsyslog-7.6.3.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.6.3.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.6.3.ebuild?rev=1.1&content-type=text/plain
Index: rsyslog-7.6.3.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.6.3.ebuild,v 1.1
2014/05/22 11:15:49 ultrabug Exp $
EAPI=5
AUTOTOOLS_AUTORECONF=1
inherit autotools-utils eutils systemd
DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
HOMEPAGE="http://www.rsyslog.com/";
SRC_URI="http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz";
LICENSE="GPL-3 LGPL-3 Apache-2.0"
KEYWORDS="~amd64 ~x86"
SLOT="0"
IUSE="dbi debug doc elasticsearch +gcrypt kerberos mongodb mysql normalize
omudpspoof oracle postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl
systemd usertools zeromq"
RDEPEND="
>=dev-libs/json-c-0.11:=
>=dev-libs/libestr-0.1.9
>=dev-libs/liblogging-1.0.1:=[stdlog]
>=sys-libs/zlib-1.2.5
dbi? ( >=dev-db/libdbi-0.8.3 )
elasticsearch? ( >=net-misc/curl-7.35.0 )
gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
kerberos? ( virtual/krb5 )
mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
mysql? ( virtual/mysql )
normalize? (
>=dev-libs/libee-0.4.0
>=dev-libs/liblognorm-0.3.1:=
!>=dev-libs/liblognorm-1.0.0
)
omudpspoof? ( >=net-libs/libnet-1.1.6 )
oracle? ( >=dev-db/oracle-instantclient-basic-10.2 )
postgres? ( >=dev-db/postgresql-base-8.4.20 )
rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0 )
redis? ( >=dev-libs/hiredis-0.11.0 )
relp? ( >=dev-libs/librelp-1.2.5 )
rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
rfc5424hmac? ( >=dev-libs/openssl-0.9.8y )
snmp? ( >=net-analyzer/net-snmp-5.7.2 )
ssl? ( >=net-libs/gnutls-2.12.23 )
systemd? ( >=sys-apps/systemd-208 )
zeromq? ( >=net-libs/czmq-1.2.0 )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
BRANCH="7-stable"
# Test suite requires a special setup or will always fail
RESTRICT="test"
# Maitainer note : open a bug to upstream
# showing that building in a separate dir fails
AUTOTOOLS_IN_SOURCE_BUILD=1
AUTOTOOLS_PRUNE_LIBTOOL_FILES="modules"
DOCS=(
AUTHORS
ChangeLog
doc/rsyslog-example.conf
"${FILESDIR}"/${BRANCH}/README.gentoo
)
PATCHES=(
"${FILESDIR}"/${BRANCH}/${PN}-7.x-mmjsonparse.patch
"${FILESDIR}"/${BRANCH}/fix-omruleset-default-value.patch
"${FILESDIR}"/${BRANCH}/bugfix_52.patch
"${FILESDIR}"/${BRANCH}/bugfix_73.patch
)
src_configure() {
# Maintainer notes:
# * Guardtime support is missing because libgt isn't yet available
# in portage.
# * Hadoop's HDFS file system output module is currently not
# supported in Gentoo because nobody is able to test it
# (JAVA dependency).
# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
# upstream PR 129 and 136) so we need to export HIREDIS_*
# variables because rsyslog's build system depends on pkg-config.
if use redis; then
export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
fi
local myeconfargs=(
# Input Plugins without depedencies
--enable-imfile
--enable-impstats
--enable-imptcp
--enable-imttcp
# Message Modificiation Plugins without depedencies
--enable-mmanon
--enable-mmaudit
--enable-mmcount
--enable-mmfields
--enable-mmjsonparse
--enable-mmpstrucdata
--enable-mmsequence
--enable-mmutf8fix
# Output Modification Plugins without dependencies
--enable-mail
--enable-omprog
--enable-omruleset
--enable-omstdout
--enable-omuxsock
# Misc
--enable-pmaixforwardedfrom
--enable-pmcisconames
--enable-pmlastmsg
--enable-pmrfc3164sd
--enable-pmsnare
--enable-sm_cust_bindcdr
# DB
$(use_enable dbi libdbi)
$(use_enable mongodb ommongodb)
$(use_enable mysql)
$(use_enable oracle)
$(use_enable postgres pgsql)
$(use_enable redis omhiredis)
# Debug
$(use_enable debug)
$(use_enable debug diagtools)
$(use_enable debug imdiag)
$(use_enable debug memcheck)
$(use_enable debug rtinst)
$(use_enable debug valgrind)
# Misc
$(use_enable elasticsearch)
$(use_enable gcrypt libgcrypt)
$(use_enable kerberos gssapi-krb5)
$(use_enable normalize mmnormalize)
$(use_enable omudpspoof)
$(use_enable rabbitmq omrabbitmq)
$(use_enable relp)
$(use_enable rfc3195)
$(use_enable rfc5424hmac mmrfc5424addhmac)
$(use_enable snmp)
$(use_enable snmp mmsnmptrapd)
$(use_enable ssl gnutls)
$(use_enable systemd imjournal)
$(use_enable systemd omjournal)
$(use_enable usertools)
$(use_enable zeromq imzmq3)
$(use_enable zeromq omzmq3)
"$(systemd_with_unitdir)"
)
autotools-utils_src_configure
}
src_install() {
use doc && HTML_DOCS=( "${S}"/doc/ )
autotools-utils_src_install
newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
keepdir /var/empty/dev
keepdir /var/spool/${PN}
keepdir /etc/ssl/${PN}
keepdir /etc/${PN}.d
insinto /etc
newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
insinto /etc/rsyslog.d/
doins "${FILESDIR}/${BRANCH}/50-default.conf"
insinto /etc/logrotate.d/
newins "${FILESDIR}/${BRANCH}/${PN}.logrotate-r1" ${PN}
if use mysql; then
insinto /usr/share/doc/${PF}/scripts/mysql
doins plugins/ommysql/{createDB.sql,contrib/delete_mysql}
fi
if use postgres; then
insinto /usr/share/doc/${PF}/scripts/pgsql
doins plugins/ompgsql/createDB.sql
fi
}
pkg_postinst() {
local advertise_readme=0
if [[ -z "${REPLACING_VERSIONS}" ]]; then
# This is a new installation
advertise_readme=1
if use mysql || use postgres; then
echo
elog "Sample SQL scripts for MySQL & PostgreSQL have
been installed to:"
elog " /usr/share/doc/${PF}/scripts"
fi
if use ssl; then
echo
elog "To create a default CA and certificates for your
server and clients, run:"
elog " emerge --config =${PF}"
elog "on your logging server. You can run it several
times,"
elog "once for each logging client. The client
certificates will be signed"
elog "using the CA certificate generated during the
first run."
fi
fi
if [[ -z "${REPLACING_VERSIONS}" ]] || [[ ${REPLACING_VERSIONS} < 8.0
]]; then
# Show this message until rsyslog-8.x
echo
elog "Since ${PN}-7.6.3 we no longer use the catch-all log
target"
elog "\"/var/log/syslog\" due to its redundancy to the other
log targets."
advertise_readme=1
fi
if [[ ${advertise_readme} -gt 0 ]]; then
# We need to show the README file location
echo ""
elog "Please read"
elog ""
elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
elog ""
elog "for more details."
fi
}
pkg_config() {
if ! use ssl ; then
einfo "There is nothing to configure for rsyslog unless you"
einfo "used USE=ssl to build it."
return 0
fi
# Make sure the certificates directory exists
CERTDIR="${EROOT}/etc/ssl/${PN}"
if [ ! -d "${CERTDIR}" ]; then
mkdir "${CERTDIR}" || die
fi
einfo "Your certificates will be stored in ${CERTDIR}"
# Create a default CA if needed
if [ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]; then
einfo "No CA key and certificate found in ${CERTDIR}, creating
them for you..."
certtool --generate-privkey \
--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
cat > "${T}/${PF}.$$" <<- _EOF
cn = Portage automated CA
ca
cert_signing_key
expiration_days = 3650
_EOF
certtool --generate-self-signed \
--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
--template "${T}/${PF}.$$" &>/dev/null
chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
# Create the server certificate
echo
einfon "Please type the Common Name of the SERVER you wish to
create a certificate for: "
read -r CN
einfo "Creating private key and certificate for server ${CN}..."
certtool --generate-privkey \
--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
cat > "${T}/${PF}.$$" <<- _EOF
cn = ${CN}
tls_www_server
dns_name = ${CN}
expiration_days = 3650
_EOF
certtool --generate-certificate \
--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
--template "${T}/${PF}.$$" &>/dev/null
chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
else
einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA
and SERVER creation."
fi
# Create a client certificate
echo
einfon "Please type the Common Name of the CLIENT you wish to create a
certificate for: "
read -r CN
einfo "Creating private key and certificate for client ${CN}..."
certtool --generate-privkey \
--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
cat > "${T}/${PF}.$$" <<- _EOF
cn = ${CN}
tls_www_client
dns_name = ${CN}
expiration_days = 3650
_EOF
certtool --generate-certificate \
--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
--template "${T}/${PF}.$$" &>/dev/null
chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
rm -f "${T}/${PF}.$$"
echo
einfo "Here is the documentation on how to encrypt your log traffic:"
einfo " http://www.rsyslog.com/doc/rsyslog_tls.html";
}
