From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QLvUs-0003qS-TQ for garchives@archives.gentoo.org; Mon, 16 May 2011 10:57:59 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8CE8B1C15F; Mon, 16 May 2011 10:57:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2359E1C15F for ; Mon, 16 May 2011 10:57:51 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 833AA1B4024 for ; Mon, 16 May 2011 10:57:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id C74B27448A for ; Mon, 16 May 2011 10:57:49 +0000 (UTC) From: "Alexys Jacob" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexys Jacob" Message-ID: Subject: [gentoo-commits] dev/ultrabug:master commit in: app-admin/rsyslog/files/5-stable/, app-admin/rsyslog/ X-VCS-Repository: dev/ultrabug X-VCS-Files: app-admin/rsyslog/Manifest app-admin/rsyslog/files/5-stable/rsyslog-gentoo.conf app-admin/rsyslog/files/5-stable/rsyslog.confd app-admin/rsyslog/files/5-stable/rsyslog.initd app-admin/rsyslog/files/5-stable/rsyslog.logrotate app-admin/rsyslog/metadata.xml app-admin/rsyslog/rsyslog-5.8.0-r1.ebuild X-VCS-Directories: app-admin/rsyslog/files/5-stable/ app-admin/rsyslog/ X-VCS-Committer: ultrabug X-VCS-Committer-Name: Alexys Jacob X-VCS-Revision: d445422743ed73eabee03ac99219821d629af3c5 Date: Mon, 16 May 2011 10:57:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: a6be73cf8ae8bacd0e6acb46ab81b96b commit: d445422743ed73eabee03ac99219821d629af3c5 Author: Ultrabug gentoo org> AuthorDate: Mon May 16 10:57:40 2011 +0000 Commit: Alexys Jacob gentoo org> CommitDate: Mon May 16 10:57:40 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/ultrabug.git;a= =3Dcommit;h=3Dd4454227 moved to tree --- app-admin/rsyslog/Manifest | 7 - .../rsyslog/files/5-stable/rsyslog-gentoo.conf | 90 -------- app-admin/rsyslog/files/5-stable/rsyslog.confd | 17 -- app-admin/rsyslog/files/5-stable/rsyslog.initd | 38 ---- app-admin/rsyslog/files/5-stable/rsyslog.logrotate | 9 - app-admin/rsyslog/metadata.xml | 19 -- app-admin/rsyslog/rsyslog-5.8.0-r1.ebuild | 222 --------------= ------ 7 files changed, 0 insertions(+), 402 deletions(-) diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest deleted file mode 100644 index 1f4b8f7..0000000 --- a/app-admin/rsyslog/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX 5-stable/rsyslog-gentoo.conf 3998 RMD160 db8979c4cfe4aa43c6ae5583972= a21037dddd161 SHA1 9d4702ac3b505293ad922cc85ef20f0a4a3ae848 SHA256 d31ba4= 77fb94c82cd2362694b680d43bfc5eb83c6e930202feb7531c4396982b -AUX 5-stable/rsyslog.confd 654 RMD160 ca340f748c84404df86bfdaf9ca9d47d0f= f38121 SHA1 e56695ebc21a30f60f1b070f8f26236677ef5d81 SHA256 c476c2180fcce= af581d26d2da6201fbe7a2b9fc89c58456fdb3bdaf18a4cbb56 -AUX 5-stable/rsyslog.initd 798 RMD160 691fa40e5f7aadad2ff0d3795a7dd6f544= b523eb SHA1 2013e291f02c6a687551a4653dc6dbe21166431e SHA256 79cbd52fd54fa= 36e9d8d658124b24e7f388fc7cb34240afdd9d0aaa35b3badfa -AUX 5-stable/rsyslog.logrotate 440 RMD160 b2599c94c718af02a641e762960b97= 96952411bb SHA1 228dba04c683d778bccd86f6bcd80650b9c774b4 SHA256 f0effc19b= d1f1bfa367d65d6516c73509cb34545157b9e91cf6e437685dd3fe5 -DIST rsyslog-5.8.0.tar.gz 2336866 RMD160 ee0491ec0986ab1ec507a40d5129ea9= 0a0bbdb85 SHA1 5a64f0ca8b6d5b32db1c20d46965803a2d8d047a SHA256 e034b02473= fd7e5313522173ec2f6c57e6fbcaec2c6b289edb968b1d64ae3ffd -EBUILD rsyslog-5.8.0-r1.ebuild 6325 RMD160 a0ae20ecd2f138d22bcfda8391bd9= 896845ecb95 SHA1 34a4d513c772d1cef2d0a2f18d8f88d0ca3ac5b2 SHA256 5421c6d9= bb7f3c6ae2e5f9bed324723ba0cb0fa64446551adb1ffc4527daf2dc -MISC metadata.xml 677 RMD160 02eb7182593e766a62cfbad77295d36ebecbc728 SH= A1 1f9ed7a28d21a7fef0df3a354709775756d169d2 SHA256 0f2b6a04926147b5436f5b= 303cde33b0fd291ca4d1a56b9bcf4f8c0dc9f890fc diff --git a/app-admin/rsyslog/files/5-stable/rsyslog-gentoo.conf b/app-a= dmin/rsyslog/files/5-stable/rsyslog-gentoo.conf deleted file mode 100644 index 40442c9..0000000 --- a/app-admin/rsyslog/files/5-stable/rsyslog-gentoo.conf +++ /dev/null @@ -1,90 +0,0 @@ -# rsyslog v5: load input modules -# If you do not load inputs, nothing happens! -# You may need to set the module load path if modules are not found. - -$ModLoad immark.so # provides --MARK-- message capability -$ModLoad imuxsock.so # provides support for local system logging (e.g. v= ia logger command) -$ModLoad imklog.so # kernel logging (formerly provided by rklogd) - -# Include configuration files from directory -$IncludeConfig /etc/rsyslog.d/* - -# Check config syntax on startup and abort if unclean (default off) -#$AbortOnUncleanConfig on - -# Reduce repeating messages (default off) -#$RepeatedMsgReduction on - -# 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/messag= es - -# The authpriv file has restricted access. -authpriv.* /var/log/secure - -# Log all the mail messages in one place. -mail.* -/var/log/maillo= g - -# 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/spoole= r - -# Save boot messages also to boot.log -local7.* /var/log/boot.lo= g - -# More configuration examples: -# -# 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/spool/rsyslog # where to place spool files -#$ActionQueueFileName uniqName # unique name prefix for spool files -#$ActionQueueMaxDiskSpace 1g # 1gb space limit (use as much as possibl= e) -#$ActionQueueSaveOnShutdown on # save messages to disk on shutdown -#$ActionQueueType LinkedList # run asynchronously -#$ActionResumeRetryCount -1 # infinety retries if host is down -#$ActionResumeInterval 30 # retry interval -# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional -#*.* @@remote-host - -# Remote Logging with TCP + SSL/TLS -#$DefaultNetstreamDriver gtls -#$DefaultNetstreamDriverCAFile /etc/ssl/rsyslog/rsyslog_ca.cert.pem -#$DefaultNetstreamDriverCertFile /etc/ssl/rsyslog/rsyslog_CLIENT.cert.pe= m -#$DefaultNetstreamDriverKeyFile /etc/ssl/rsyslog/rsyslog_CLIENT.key.pem -#$ActionSendStreamDriverAuthMode x509/name # enable peer authentication -#$ActionSendStreamDriverPermittedPeer foo # authorize to send encrypted = data to server foo -#$ActionSendStreamDriverMode 1 # run driver in TLS-only mode - -# ######### Receiving Messages from Remote Hosts ########## -# TCP Syslog Server: -#$ModLoad imtcp # provides TCP syslog reception -#$TCPServerRun 10514 # start a TCP syslog server at port 10514 - -# TCP + SSL/TLS Syslog Server: -#$ModLoad imtcp # provides TCP syslog reception -#$DefaultNetstreamDriver gtls # use gnuTLS for data encryption -#$DefaultNetstreamDriverCAFile /etc/ssl/rsyslog/rsyslog_ca.cert.pem -#$DefaultNetstreamDriverCertFile /etc/ssl/rsyslog/rsyslog_SERVER.cert.pe= m -#$DefaultNetstreamDriverKeyFile /etc/ssl/rsyslog/rsyslog_SERVER.key.pem -#$InputTCPServerStreamDriverMode 1 # run driver in TLS-only mode -#$InputTCPServerStreamDriverAuthMode x509/name # enable peer authenticat= ion -#$InputTCPServerStreamDriverPermittedPeer bar # authorize client named b= ar (one line per client) -#$TCPServerRun 10514 # start a TCP syslog server at port 10514 - -# UDP Syslog Server: -#$ModLoad imudp.so # provides UDP syslog reception -#$UDPServerRun 514 # start a UDP syslog server at standard port 514 - -# RELP Syslog Server: -#$ModLoad imrelp # provides RELP syslog reception -#$InputRELPServerRun 10515 # start a RELP syslog server at port 10515 diff --git a/app-admin/rsyslog/files/5-stable/rsyslog.confd b/app-admin/r= syslog/files/5-stable/rsyslog.confd deleted file mode 100644 index 85e90ed..0000000 --- a/app-admin/rsyslog/files/5-stable/rsyslog.confd +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/5-stable/rsys= log.confd,v 1.1 2010/10/21 07:38:29 dev-zero Exp $ - -# Configuration file -CONFIGFILE=3D"/etc/rsyslog.conf" - -# PID file -PIDFILE=3D"/var/run/rsyslogd.pid" - -# Options to rsyslogd -# See rsyslogd(8) for more details -# Notes: -# * Do not specify another PIDFILE but use the variable above to change = the location -# * Do not specify another CONFIGFILE but use the variable above to chan= ge the location -# * "-c5" tells rsyslog to _not_ run in sysklogd compatibility mode -RSYSLOG_OPTS=3D"-c5" diff --git a/app-admin/rsyslog/files/5-stable/rsyslog.initd b/app-admin/r= syslog/files/5-stable/rsyslog.initd deleted file mode 100644 index 68ff86c..0000000 --- a/app-admin/rsyslog/files/5-stable/rsyslog.initd +++ /dev/null @@ -1,38 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/5-stable/rsys= log.initd,v 1.1 2010/10/21 07:38:29 dev-zero Exp $ - -opts=3D"reload" - -depend() { - provide logger -} - -start() { - ebegin "Starting rsyslogd" - start-stop-daemon \ - --start --quiet --exec /usr/sbin/rsyslogd \ - -- ${RSYSLOG_OPTS} -i "${PIDFILE}" -f "${CONFIGFILE}" - eend $? -} - -stop() { - ebegin "Stopping rsyslogd" - start-stop-daemon \ - --stop --quiet \ - --pidfile "${PIDFILE}" - eend $? -} - -reload() { - if [ ! -f "${PIDFILE}" ]; then - eerror "rsyslogd not running" - return 1 - fi - - ebegin "Re-opening rsyslogd log files" - start-stop-daemon --stop --oknodo --signal HUP \ - --pidfile "${PIDFILE}" - eend $? -} diff --git a/app-admin/rsyslog/files/5-stable/rsyslog.logrotate b/app-adm= in/rsyslog/files/5-stable/rsyslog.logrotate deleted file mode 100644 index 86095de..0000000 --- a/app-admin/rsyslog/files/5-stable/rsyslog.logrotate +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/5-stable/rsys= log.logrotate,v 1.1 2010/10/21 07:38:29 dev-zero Exp $ -/var/log/messages /var/log/secure /var/log/maillog /var/log/cron /var/lo= g/spooler /var/log/boot.log { - sharedscripts - postrotate - /etc/init.d/rsyslog reload &>/dev/null || true - endscript -} diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.= xml deleted file mode 100644 index b3cbe0f..0000000 --- a/app-admin/rsyslog/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - -no-herd - - ultrabug@gentoo.org - Alexys Jacob - Primary Maintainer - - - dev-zero@gentoo.org - Tiziano M=C3=BCller - co-maintainer - - - Add support for the Reliable Event Logging Protocol= using dev-libs/librelp - Add support for the UDP spoofing module (omudpspo= of) using net-libs/libnet - - diff --git a/app-admin/rsyslog/rsyslog-5.8.0-r1.ebuild b/app-admin/rsyslo= g/rsyslog-5.8.0-r1.ebuild deleted file mode 100644 index ac677a3..0000000 --- a/app-admin/rsyslog/rsyslog-5.8.0-r1.ebuild +++ /dev/null @@ -1,222 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-5.8.0.ebuil= d,v 1.1 2011/04/26 07:33:03 ultrabug Exp $ - -EAPI=3D4 - -inherit autotools-utils systemd - -DESCRIPTION=3D"An enhanced multi-threaded syslogd with database support = and more." -HOMEPAGE=3D"http://www.rsyslog.com/" -SRC_URI=3D"http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz" - -LICENSE=3D"GPL-3 LGPL-3" -KEYWORDS=3D"~amd64 ~arm ~hppa ~sparc ~x86" -SLOT=3D"0" -IUSE=3D"dbi debug doc extras gnutls kerberos mysql oracle postgres relp = snmp static-libs zlib" - -DEPEND=3D"dbi? ( dev-db/libdbi ) - extras? ( net-libs/libnet ) - gnutls? ( net-libs/gnutls ) - kerberos? ( virtual/krb5 ) - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql-base ) - oracle? ( dev-db/oracle-instantclient-basic ) - relp? ( >=3Ddev-libs/librelp-0.1.3 ) - snmp? ( net-analyzer/net-snmp ) - zlib? ( sys-libs/zlib )" -RDEPEND=3D"${DEPEND}" - -BRANCH=3D"5-stable" - -# need access to certain device nodes -RESTRICT=3D"test" - -# Maitainer note : open a bug to upstream -# showing that building in a separate dir fails -AUTOTOOLS_IN_SOURCE_BUILD=3D1 - -DOCS=3D(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. - local myeconfargs=3D( - --disable-gui - --disable-rfc3195 - --enable-largefile - --enable-unlimited-select - --enable-imdiag - --enable-imfile - --enable-imtemplate - --enable-imptcp - --enable-mail - --enable-omprog - --enable-omstdout - --enable-omtemplate - --enable-omdbalerting - --enable-omuxsock - --enable-pmlastmsg - --enable-pmrfc3164sd - $(use_enable extras omudpspoof) - $(use_enable zlib) - $(use_enable mysql) - $(use_enable dbi libdbi) - $(use_enable postgres pgsql) - $(use_enable oracle oracle) - $(use_enable gnutls) - $(use_enable kerberos gssapi-krb5) - $(use_enable relp) - $(use_enable snmp) - $(use_enable debug) - $(use_enable debug rtinst) - $(use_enable debug diagtools) - $(use_enable debug memcheck) - $(use_enable debug valgrind) - ) - - systemd_to_myeconfargs - autotools-utils_src_configure -} - -src_install() { - use doc && HTML_DOCS=3D(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 - - 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 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 gnutls; then - echo - elog "To create a default CA and certificates for your server and clie= nts, run:" - elog " emerge --config =3D${PF}" - elog "on your logging server. You can run it several times," - elog "once for each logging client. The client certificates will be si= gned" - elog "using the CA certificate generated during the first run." - fi -} - -pkg_config() { - if ! use gnutls ; then - einfo "There is nothing to configure for rsyslog unless you" - einfo "used USE=3Dgnutls to build it." - return 0 - fi - - # Make sure the certificates directory exists - CERTDIR=3D"${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 fo= r you..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - cat > "${T}/${PF}.$$" <<_EOF - cn =3D Portage automated CA - ca - cert_signing_key - expiration_days =3D 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 =3D ${CN} - tls_www_server - dns_name =3D ${CN} - expiration_days =3D 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 SE= RVER 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 =3D ${CN} - tls_www_client - dns_name =3D ${CN} - expiration_days =3D 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" -}