Restore stable version

(Portage version: 2.2.10/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 09BF4F54C2BA7F3C!)

4 files changed, 241 insertions, 1 deletions

diff --git a/app-admin/ulogd/ChangeLog b/app-admin/ulogd/ChangeLog
index b6a7143bbde6..1bd7f0d9f3b9 100644
--- a/app-admin/ulogd/ChangeLog
+++ b/app-admin/ulogd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/ulogd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.84 2014/04/26 11:34:06 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.85 2014/04/27 09:57:27 hwoarang Exp $
+
+*ulogd-2.0.2 (27 Apr 2014)
+
+  27 Apr 2014; Markos Chandras <hwoarang@gentoo.org>
+  +files/ulogd-2.0.2-automagic.patch, +files/ulogd-2.init, +ulogd-2.0.2.ebuild:
+  Restore stable version
 
   26 Apr 2014; Markos Chandras <hwoarang@gentoo.org>
   -files/ulogd-2.0.2-automagic.patch, -files/ulogd-2.init, -ulogd-2.0.2.ebuild,
diff --git a/app-admin/ulogd/files/ulogd-2.0.2-automagic.patch b/app-admin/ulogd/files/ulogd-2.0.2-automagic.patch
new file mode 100644
index 000000000000..b3d269b9d7c3
--- /dev/null
+++ b/app-admin/ulogd/files/ulogd-2.0.2-automagic.patch
@@ -0,0 +1,60 @@
+--- 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)
diff --git a/app-admin/ulogd/files/ulogd-2.init b/app-admin/ulogd/files/ulogd-2.init
new file mode 100644
index 000000000000..68718f3b0e85
--- /dev/null
+++ b/app-admin/ulogd/files/ulogd-2.init
@@ -0,0 +1,43 @@
+#!/sbin/runscript
+# Copyright 1999-2014 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.3 2014/04/27 09:57:27 hwoarang 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 $?
+}
diff --git a/app-admin/ulogd/ulogd-2.0.2.ebuild b/app-admin/ulogd/ulogd-2.0.2.ebuild
new file mode 100644
index 000000000000..7d19be0f7b67
--- /dev/null
+++ b/app-admin/ulogd/ulogd-2.0.2.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-2.0.2.ebuild,v 1.9 2014/04/27 09:57:27 hwoarang Exp $
+
+EAPI="5"
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+inherit autotools-utils eutils linux-info readme.gentoo user
+
+DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
+HOMEPAGE="http://netfilter.org/projects/ulogd/index.html"
+SRC_URI="http://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc x86"
+IUSE="dbi doc mysql nfacct +nfct +nflog pcap postgres sqlite"
+
+RDEPEND="net-firewall/iptables
+	>=net-libs/libnfnetlink-1.0.1
+	>=net-libs/libmnl-1.0.3
+	dbi? ( dev-db/libdbi )
+	nfacct? ( >=net-libs/libnetfilter_acct-1.0.1 )
+	nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 )
+	nflog? ( >=net-libs/libnetfilter_log-1.0.0 )
+	mysql? ( virtual/mysql )
+	pcap? ( net-libs/libpcap )
+	postgres? ( dev-db/postgresql-base )
+	sqlite? ( dev-db/sqlite:3 )"
+
+DEPEND="${RDEPEND}
+	doc? (
+		app-text/linuxdoc-tools
+		app-text/texlive-core
+		virtual/latex-base
+	)"
+
+DOCS=( AUTHORS README TODO )
+PATCHES=(
+	# fix automagic support of dbi, pcap and sqlite3 output plugins
+	"${FILESDIR}/${P}-automagic.patch"
+)
+DOC_CONTENTS="You must have at least one logging stack enabled to make ulogd work.
+Please edit example configuration located at /etc/ulogd.conf"
+
+pkg_setup() {
+	enewgroup ulogd
+	enewuser ulogd -1 -1 /var/log/ulogd ulogd
+
+	linux-info_pkg_setup
+
+	if kernel_is lt 2 6 14; then
+		die "ulogd2 requires kernel newer than 2.6.14"
+	fi
+
+	if kernel_is lt 2 6 18; then
+		ewarn
+		ewarn "You are using kernel older than 2.6.18"
+		ewarn "Some ulogd2 features may be unavailable"
+		ewarn
+	fi
+
+	if use nfacct && kernel_is lt 3 3 0; then
+		ewarn "NFACCT input plugin requires kernel newer than 3.3.0"
+	fi
+}
+
+src_prepare() {
+	# - make all logs to be kept in a single dir /var/log/ulogd
+	# - place sockets in /run instead of /tmp
+	sed -i \
+		-e 's:var/log:var/log/ulogd:g' \
+		-e 's:tmp:run:g' \
+		ulogd.conf.in || die 'sed on ulogd.conf.in failed'
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with dbi)
+		$(use_enable nfacct)
+		$(use_enable nfct)
+		$(use_enable nflog)
+		$(use_with mysql)
+		$(use_with pcap)
+		$(use_with postgres pgsql)
+		$(use_with sqlite)
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+
+	if use doc ; then
+		# prevent access violations from generation of bitmap font files
+		export VARTEXFONTS="${T}"/fonts
+		emake -C doc
+	fi
+}
+
+src_install() {
+	autotools-utils_src_install
+	readme.gentoo_create_doc
+	prune_libtool_files --modules
+
+	if use doc ; then
+		dohtml doc/${PN}.html
+		dodoc doc/${PN}.dvi doc/${PN}.txt doc/${PN}.ps
+	fi
+
+	use sqlite && dodoc doc/sqlite3.table
+	use mysql && dodoc doc/mysql-*.sql
+	use postgres && dodoc doc/pgsql-*.sql
+	doman ${PN}.8
+
+	insinto /etc
+	doins ${PN}.conf
+	fowners root:ulogd /etc/ulogd.conf
+	fperms 640 /etc/ulogd.conf
+
+	newinitd "${FILESDIR}/${PN}-2.init" ${PN}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}-2.logrotate" ${PN}
+
+	diropts -o ulogd -g ulogd
+	keepdir /var/log/ulogd
+}