ultrabug    14/03/10 13:00:19

  Modified:             metadata.xml ChangeLog
  Added:                rsyslog-7.4.10.ebuild
  Log:
  version bump fix #501978
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 
B658FA13)

Revision  Changes    Path
1.15                 app-admin/rsyslog/metadata.xml

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/metadata.xml?rev=1.15&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/metadata.xml?rev=1.15&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/metadata.xml?r1=1.14&r2=1.15

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/rsyslog/metadata.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- metadata.xml        24 Dec 2013 12:21:31 -0000      1.14
+++ metadata.xml        10 Mar 2014 13:00:19 -0000      1.15
@@ -6,6 +6,11 @@
     <name>Ultrabug</name>
     <description>Primary Maintainer</description>
   </maintainer>
+  <maintainer>
+    <email>whi...@whissi.de</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>



1.110                app-admin/rsyslog/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/ChangeLog?rev=1.110&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/ChangeLog?rev=1.110&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/ChangeLog?r1=1.109&r2=1.110

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- ChangeLog   1 Mar 2014 22:11:24 -0000       1.109
+++ ChangeLog   10 Mar 2014 13:00:19 -0000      1.110
@@ -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.109 
2014/03/01 22:11:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.110 
2014/03/10 13:00:19 ultrabug Exp $
+
+*rsyslog-7.4.10 (10 Mar 2014)
+
+  10 Mar 2014; Ultrabug <ultra...@gentoo.org> +rsyslog-7.4.10.ebuild,
+  metadata.xml:
+  version bump fix #501978 thx to Thomas D., add Thomas D. as proxy-maintainer
 
   01 Mar 2014; Michał Górny <mgo...@gentoo.org> rsyslog-7.2.7.ebuild,
   rsyslog-7.4.3.ebuild, rsyslog-7.4.4.ebuild, rsyslog-7.4.6.ebuild,



1.1                  app-admin/rsyslog/rsyslog-7.4.10.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.10.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.10.ebuild?rev=1.1&content-type=text/plain

Index: rsyslog-7.4.10.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.4.10.ebuild,v 
1.1 2014/03/10 13:00:19 ultrabug Exp $

EAPI=5
AUTOTOOLS_AUTORECONF=yes

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 ~arm ~hppa ~x86"
SLOT="0"
IUSE="dbi debug doc extras kerberos mongodb mysql oracle postgres relp snmp ssl 
static-libs systemd zeromq zlib"

RDEPEND="
        dev-libs/json-c:=
        dev-libs/libee
        >=dev-libs/libestr-0.1.9
        dev-libs/libgcrypt:=
        >=dev-libs/liblogging-1.0.1:=
        <dev-libs/liblognorm-1.0.0:=
        dbi? ( dev-db/libdbi )
        extras? ( net-libs/libnet )
        kerberos? ( virtual/krb5 )
        mongodb? ( dev-libs/libmongo-client )
        mysql? ( virtual/mysql )
        postgres? ( dev-db/postgresql-base )
        oracle? ( dev-db/oracle-instantclient-basic )
        relp? ( >=dev-libs/librelp-1.0.3 )
        snmp? ( net-analyzer/net-snmp )
        ssl? ( net-libs/gnutls )
        systemd? ( sys-apps/systemd )
        zeromq? ( >=net-libs/zeromq-3 <net-libs/czmq-2 )
        zlib? ( sys-libs/zlib )"
DEPEND="${RDEPEND}
        virtual/pkgconfig"

BRANCH="7-stable"

# need access to certain device nodes
RESTRICT="test"

# Maitainer note : open a bug to upstream
# showing that building in a separate dir fails
AUTOTOOLS_IN_SOURCE_BUILD=1

DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)

src_configure() {
        # Maintainer notes:
        # * rfc3195 needs a library and development of that library
        #   is suspended, so we disable it
        # * About the java GUI:
        #   The maintainer says there is no real installation support
        #   for the java GUI, so we disable it for now.
        # * mongodb : doesnt work with mongo-c-driver ?
        local myeconfargs=(
                --enable-cached-man-pages
                --disable-gui
                --disable-rfc3195
                --enable-imdiag
                --enable-imfile
                --enable-impstats
                --enable-imptcp
                --enable-largefile
                --enable-mail
                --enable-mmnormalize
                --enable-mmjsonparse
                --enable-mmaudit
                --enable-mmanon
                --enable-omprog
                --enable-omstdout
                --enable-omuxsock
                --enable-pmlastmsg
                --enable-pmrfc3164sd
                --enable-pmcisconames
                --enable-pmaixforwardedfrom
                --enable-pmsnare
                --enable-sm_cust_bindcdr
                --enable-unlimited-select
                --enable-uuid
                $(use_enable dbi libdbi)
                $(use_enable debug)
                $(use_enable debug rtinst)
                $(use_enable debug diagtools)
                $(use_enable debug memcheck)
                $(use_enable debug valgrind)
                $(use_enable extras omudpspoof)
                $(use_enable kerberos gssapi-krb5)
                $(use_enable mongodb ommongodb)
                $(use_enable mysql)
                $(use_enable oracle)
                $(use_enable postgres pgsql)
                $(use_enable relp)
                $(use_enable snmp)
                $(use_enable snmp mmsnmptrapd)
                $(use_enable ssl gnutls)
                $(use_enable systemd omjournal)
                $(use_enable zlib)
                $(use_enable zeromq imzmq3)
                $(use_enable zeromq omzmq3)
                "$(systemd_with_unitdir)"
        )
        autotools-utils_src_configure
}

src_install() {
        use doc && HTML_DOCS=(doc/)
        autotools-utils_src_install

        insinto /etc
        newins "${FILESDIR}/${BRANCH}/${PN}-gentoo.conf" ${PN}.conf
        newconfd "${FILESDIR}/${BRANCH}/${PN}.confd" ${PN}
        newinitd "${FILESDIR}/${BRANCH}/${PN}.initd" ${PN}
        keepdir /var/spool/${PN}
        keepdir /etc/ssl/${PN}
        keepdir /etc/${PN}.d

        use static-libs || find "${D}" -name '*.la' -delete || die

        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

        insinto /etc/logrotate.d/
        newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
}

pkg_postinst() {
        if [[ -z "${REPLACING_VERSIONS}" ]]; then
                # This is a new installation

                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
}

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="${ROOT}/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";
}




Reply via email to