ultrabug 14/12/16 14:18:41 Modified: ChangeLog Added: rsyslog-8.6.0.ebuild Log: version bump wrt #532400 by Thomas D. (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key B658FA13)
Revision Changes Path 1.130 app-admin/rsyslog/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/ChangeLog?rev=1.130&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/ChangeLog?rev=1.130&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/ChangeLog?r1=1.129&r2=1.130 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- ChangeLog 3 Nov 2014 11:01:46 -0000 1.129 +++ ChangeLog 16 Dec 2014 14:18:41 -0000 1.130 @@ -1,6 +1,12 @@ # 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.129 2014/11/03 11:01:46 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.130 2014/12/16 14:18:41 ultrabug Exp $ + +*rsyslog-8.6.0 (16 Dec 2014) + + 16 Dec 2014; Ultrabug <ultra...@gentoo.org> +rsyslog-8.6.0.ebuild, + +files/8-stable/10-respect_CFLAGS-r1.patch: + version bump wrt #532400 by Thomas D. 03 Nov 2014; Aaron W. Swenson <titanof...@gentoo.org> rsyslog-8.4.2.ebuild: Update PostgreSQL dependencies and/or checks to virtual/postgresql. 1.1 app-admin/rsyslog/rsyslog-8.6.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-8.6.0.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-8.6.0.ebuild?rev=1.1&content-type=text/plain Index: rsyslog-8.6.0.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-8.6.0.ebuild,v 1.1 2014/12/16 14:18:41 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/"; if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI=" git://github.com/rsyslog/${PN}.git https://github.com/rsyslog/${PN}.git " DOC_REPO_URI=" git://github.com/rsyslog/${PN}-doc.git https://github.com/rsyslog/${PN}-doc.git " inherit git-r3 KEYWORDS="" else SRC_URI=" http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz doc? ( http://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz ) " KEYWORDS="~amd64 ~arm ~hppa ~x86" fi LICENSE="GPL-3 LGPL-3 Apache-2.0" SLOT="0" IUSE="dbi debug doc elasticsearch +gcrypt jemalloc kerberos mongodb mysql normalize omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test 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:= ) jemalloc? ( >=dev-libs/jemalloc-3.3.1 ) kerberos? ( virtual/krb5 ) mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) mysql? ( virtual/mysql ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-1.0.0:= ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=virtual/postgresql-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" if [[ ${PV} == "9999" ]]; then RDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" fi BRANCH="8-stable" if [[ ${PV} < "8.7" ]]; then # Test suite is broken in v8.6.0 release tarball # Upstream is notified; Will be fixed with v8.7.0 in January RESTRICT="test" fi # 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 "${FILESDIR}"/${BRANCH}/README.gentoo ) src_unpack() { if [[ ${PV} == "9999" ]]; then git-r3_fetch git-r3_checkout else unpack ${P}.tar.gz fi if use doc; then if [[ ${PV} == "9999" ]]; then git-r3_fetch "${DOC_REPO_URI}" git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs else local doc_tarball="${PN}-doc-${PV}.tar.gz" cd "${S}" || die "Cannot change dir into '$S'" mkdir docs || die "Failed to create docs directory" cd docs || die "Failed to change dir into '${S}/docs'" unpack ${doc_tarball} fi fi } src_prepare() { epatch "${FILESDIR}"/${BRANCH}/10-respect_CFLAGS-r1.patch epatch_user autotools-utils_src_prepare } 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=( --disable-generate-man-pages $(use_enable test testbench) # Input Plugins without depedencies --enable-imdiag --enable-imfile --enable-impstats --enable-imptcp # Message Modificiation Plugins without depedencies --enable-mmanon --enable-mmaudit --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-pmciscoios --enable-pmcisconames --enable-pmlastmsg --enable-pmsnare # DB $(use_enable dbi libdbi) $(use_enable mongodb ommongodb) $(use_enable mysql) $(use_enable postgres pgsql) $(use_enable redis omhiredis) # Debug $(use_enable debug) $(use_enable debug diagtools) $(use_enable debug memcheck) $(use_enable debug rtinst) $(use_enable debug valgrind) # Misc $(use_enable elasticsearch) $(use_enable gcrypt libgcrypt) $(use_enable jemalloc) $(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_compile() { autotools-utils_src_compile if use doc -a ${PV} == "9999"; then einfo "Building documentation ..." local doc_dir="${S}/docs" cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" sphinx-build -b html source build || die "Building documentation failed!" fi } src_test() { local _has_increased_ulimit= if ulimit -n 3072; then _has_increased_ulimit="true" fi if ! emake --jobs 1 check; then eerror "Test suite failed! :(" if [ -z "${_has_increased_ulimit}" ]; then eerror "Probably because open file limit couldn't be set to 3072." fi if has userpriv $FEATURES; then eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \ "before you submit a bug report." fi fi } src_install() { use doc && HTML_DOCS=( "${S}/docs/build/" ) autotools-utils_src_install newconfd "${FILESDIR}/${BRANCH}/${PN}.confd" ${PN} newinitd "${FILESDIR}/${BRANCH}/${PN}.initd" ${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" ${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"; }
