[gentoo-commits] gentoo-x86 commit in app-admin/ulogd/files: ulogd.init ulogd.service ulogd-2.0.5-remove-db-automagic.patch ulogd.logrotate ulogd-2-ng.init ulogd-2.logrotate

[Ian Delaney (idella4)]

idella4     15/05/30 09:38:29

  Added:                ulogd.init ulogd.service
                        ulogd-2.0.5-remove-db-automagic.patch
                        ulogd.logrotate
  Removed:              ulogd-2-ng.init ulogd-2.logrotate
  Log:
  revbump; upgrade -2.0.4 with support of systemd via new system files listed. bump; additional support as for revbump, all files and patches by maintainer from bug #550330, add use flag ulog to metadata, rm old version -2.0.3
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

Revision  Changes    Path
1.1                  app-admin/ulogd/files/ulogd.init

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

Index: ulogd.init
===================================================================
#!/sbin/runscript
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/files/ulogd.init,v 1.1 2015/05/30 09:38:29 idella4 Exp $

extra_started_commands="reload reopen"

: ${ULOGD_BINARY:=/usr/sbin/ulogd}
: ${ULOGD_PIDFILE:=/run/${SVCNAME}.pid}
: ${ULOGD_OPTS:=--daemon --uid ulogd --pidfile ${ULOGD_PIDFILE}}

depend() {
	before iptables ip6tables ebtables firewall
	after mysql postgresql
}

start() {
	ebegin "Starting ${SVCNAME}"
	start-stop-daemon --start \
		--exec ${ULOGD_BINARY} --pidfile ${ULOGD_PIDFILE} \
		-- ${ULOGD_OPTS}
	eend $?
}

stop() {
	ebegin "Stopping ${SVCNAME}"
	start-stop-daemon --stop --pidfile ${ULOGD_PIDFILE}
	eend $?
}

reload() {
	ebegin "Reloading ${SVCNAME} configuration"
	start-stop-daemon --signal USR1 --pidfile ${ULOGD_PIDFILE}
	eend $?
}

reopen() {
	ebegin "Reopening ${SVCNAME} logfiles"
	start-stop-daemon --signal HUP --pidfile ${ULOGD_PIDFILE}
	eend $?
}



1.1                  app-admin/ulogd/files/ulogd.service

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

Index: ulogd.service
===================================================================
[Unit]
Description=A userspace logging daemon for netfilter/iptables related logging
Before=iptables.service ip6tables.service
After=mysql.service postgresql.service

[Service]
Type=simple
ExecStart=/usr/sbin/ulogd --uid ulogd --pidfile /run/ulogd.pid
ExecReload=/bin/kill -USR1 $MAINPID

[Install]
WantedBy=network.target



1.1                  app-admin/ulogd/files/ulogd-2.0.5-remove-db-automagic.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/ulogd/files/ulogd-2.0.5-remove-db-automagic.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/ulogd/files/ulogd-2.0.5-remove-db-automagic.patch?rev=1.1&content-type=text/plain

Index: ulogd-2.0.5-remove-db-automagic.patch
===================================================================
commit c61c05c2d050410c24346d42b013d7cb39149949
Author: Harald Welte <laforge@××××××××.org>
Date:   Sun May 3 11:08:54 2015 +0200

    configure.ac: Add --without-{mysql,pgsql}
    
    In some cases you may not want to build a certain output plugin, even
    if the headers/libraries actually exist on the build host.

diff --git a/configure.ac b/configure.ac
index c814bec..1a7f8de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,7 +85,10 @@ if [! test "x$enable_nfacct" = "xyes"]; then
 	enable_nfacct="no"
 fi
 
-CT_CHECK_POSTGRES_DB()
+AC_ARG_WITH([pgsql], AS_HELP_STRING([--without-pgsql], [Build without postgresql output plugin [default=test]]))
+AS_IF([test "x$with_pgsql" != "xno"], [
+	CT_CHECK_POSTGRES_DB()
+])
 AM_CONDITIONAL(HAVE_PGSQL, test "x$PQLIBPATH" != "x")
 if test "x$PQLIBPATH" != "x"; then
 	enable_pgsql="yes"
@@ -93,7 +96,10 @@ else
 	enable_pgsql="no"
 fi
 
-CT_CHECK_MYSQL_DB()
+AC_ARG_WITH([mysql], AS_HELP_STRING([--without-mysql], [Build without mysql output plugin [default=test]]))
+AS_IF([test "x$with_mysql" != "xno"], [
+	CT_CHECK_MYSQL_DB()
+])
 AM_CONDITIONAL(HAVE_MYSQL, test "x$MYSQL_LIB" != "x")
 if test "x$MYSQL_LIB" != "x"; then
 	enable_mysql="yes"
@@ -101,6 +107,7 @@ else
 	enable_mysql="no"
 fi
 
+
 AC_ARG_WITH([sqlite], AS_HELP_STRING([--without-sqlite], [Build without SQLITE3 output plugin [default=test]]))
 AS_IF([test "x$with_sqlite" != "xno"], [
     PKG_CHECK_MODULES([libsqlite3], [sqlite3], [], [:])



1.1                  app-admin/ulogd/files/ulogd.logrotate

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

Index: ulogd.logrotate
===================================================================
/var/log/ulogd/*.log {
    sharedscripts
    missingok
    notifempty
    create 0640 ulogd
    postrotate
        [ -f /run/ulogd.pid ] && /bin/kill -HUP $(cat /run/ulogd.pid)
    endscript
}