[gentoo-commits] gentoo-x86 commit in app-admin/ulogd/files: ulogd-2.logrotate ulogd-2.0.2-automagic.patch ulogd-2.init

[gentoo-commits] gentoo-x86 commit in app-admin/ulogd/files: ulogd-2.logrotate ulogd-2.0.2-automagic.patch ulogd-2.init

[Sergey Popov (pinkbyte)]

pinkbyte    13/03/20 08:38:18

  Added:                ulogd-2.logrotate ulogd-2.0.2-automagic.patch
                        ulogd-2.init
  Log:
  Version bump, wrt bug #426868, fix bugs #375825 and #375777. Package will be maintained by Coacher <itumaykin AT gmail.com> through proxy maintainers
  
  (Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

Revision  Changes    Path
1.1                  app-admin/ulogd/files/ulogd-2.logrotate

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

Index: ulogd-2.logrotate
===================================================================
/var/log/ulogd/ulogd.log {
    notifempty
    size 1M
    create 0640 ulogd
    postrotate
        /etc/init.d/ulogd reopen_logs > /dev/null
    endscript
}

/var/log/ulogd/ulogd_syslogemu.log {
    rotate 12
    size 5M
    notifempty
    create 0640 ulogd
    postrotate
        /etc/init.d/ulogd reopen_logs > /dev/null
    endscript
}



1.1                  app-admin/ulogd/files/ulogd-2.0.2-automagic.patch

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

Index: ulogd-2.0.2-automagic.patch
===================================================================
--- configure.ac.orig	2013-03-01 19:45:23.285968838 +0400
+++ configure.ac	2013-03-15 03:38:50.587620528 +0400
@@ -20,14 +20,6 @@ AC_PROG_LIBTOOL
 dnl Checks for libraries.
 AC_SEARCH_LIBS([dlopen], [dl], [libdl_LIBS="$LIBS"; LIBS=""])
 AC_SUBST([libdl_LIBS])
-AC_SEARCH_LIBS([pcap_close], [pcap], [libpcap_LIBS="-lpcap"; LIBS=""])
-AC_SUBST([libpcap_LIBS])
-AM_CONDITIONAL([HAVE_PCAP], [test -n "$libpcap_LIBS"])
-if test "x$libpcap_LIBS" != "x"; then
-	enable_pcap="yes"
-else
-	enable_pcap="no"
-fi
 
 dnl Checks for header files.
 AC_HEADER_DIRENT
@@ -88,7 +80,10 @@ else
 	enable_mysql="no"
 fi
 
-PKG_CHECK_MODULES([libsqlite3], [sqlite3], [], [:])
+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], [], [:])
+])
 AM_CONDITIONAL([HAVE_SQLITE3], [test -n "$libsqlite3_LIBS"])
 if test "x$libsqlite3_LIBS" != "x"; then
 	enable_sqlite3="yes"
@@ -96,7 +91,10 @@ else
 	enable_sqlite3="no"
 fi
 
-CT_CHECK_DBI()
+AC_ARG_WITH([dbi], AS_HELP_STRING([--without-dbi], [Build without DBI output plugin (default: test)]))
+AS_IF([test "x$with_dbi" != "xno"], [
+    CT_CHECK_DBI()
+])
 AM_CONDITIONAL(HAVE_DBI, test "x$DBI_LIB" != "x")
 if test "x$DBI_LIB" != "x"; then
 	enable_dbi="yes"
@@ -104,6 +102,18 @@ else
 	enable_dbi="no"
 fi
 
+AC_ARG_WITH([pcap], AS_HELP_STRING([--without-pcap], [Build without PCAP output plugin (default: test)]))
+AS_IF([test "x$with_pcap" != "xno"], [
+    AC_SEARCH_LIBS([pcap_close], [pcap], [libpcap_LIBS="-lpcap"; LIBS=""])
+    AC_SUBST([libpcap_LIBS])
+])
+AM_CONDITIONAL([HAVE_PCAP], [test -n "$libpcap_LIBS"])
+if test "x$libpcap_LIBS" != "x"; then
+	enable_pcap="yes"
+else
+	enable_pcap="no"
+fi
+
 dnl AC_SUBST(DATABASE_DIR)
 dnl AC_SUBST(DATABASE_LIB)
 dnl AC_SUBST(DATABASE_LIB_DIR)



1.1                  app-admin/ulogd/files/ulogd-2.init

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

Index: ulogd-2.init
===================================================================
#!/sbin/runscript
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/files/ulogd-2.init,v 1.1 2013/03/20 08:38:18 pinkbyte Exp $

ULOGD_PIDFILE="/run/ulogd.pid"
ULOGD_EXEC="/usr/sbin/ulogd"
ULOGD_OPTS="-u ulogd"

extra_started_commands="reload reopen_logs"

depend() {
	need net
}

start() {
	ebegin "Starting ${SVCNAME}"
	start-stop-daemon --start --quiet \
		--make-pidfile \
		--pidfile ${ULOGD_PIDFILE} \
		--background \
		--exec ${ULOGD_EXEC} \
		-- ${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_logs() {
	ebegin "Reopening ${SVCNAME} logfiles"
	start-stop-daemon --signal HUP --pidfile ${ULOGD_PIDFILE}
	eend $?
}