[gentoo-commits] repo/gentoo:master commit in: app-admin/ulogd/files/, app-admin/ulogd/

[Patrice Clement]

commit:     c8dca1f2601eca8871bc64cf2b1ce1be17c6fee0
Author:     Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Sun Aug 28 02:27:37 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 16:29:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8dca1f2

app-admin/ulogd: remove old.

Package-Manager: portage-2.3.0

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 app-admin/ulogd/Manifest                           |   1 -
 .../files/ulogd-2.0.5-remove-db-automagic.patch    |  45 -------
 app-admin/ulogd/ulogd-2.0.5-r3.ebuild              | 148 ---------------------
 3 files changed, 194 deletions(-)

diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index 125ea5c..134f0e2 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -1,2 +1 @@
-DIST ulogd-2.0.5.tar.bz2 456258 SHA256 a221cb9f77347c0ca00d0937e27c1b90e3291a553cc62a4139b788e2e420e8c0 SHA512 bf00b8adaad7bd04077a83521b0d7accc26e644c8f3386819e7f91476178b6733f1c6554fb82dd0d3913398c83a61d65f61dc973f199f610bfaadc6251504819 WHIRLPOOL fe499ac7b4070581439a05f4f2245f7a42fe5630da5dc32b9b069511ed1faa15fe482eee08d50477d3fb1d0bf0d3855a69fc82fb0f3e8eecdf082fb642519f91
 DIST ulogd-2.0.5_p20160205.tar.gz 137899 SHA256 d6ece155270aaaea2f78740c00ae679f04e42fd90b4b7c2f342c2dddeb414ee4 SHA512 99c824fcb404f2f4d7b1bd4d8c9231a1a61121f9ae88901d8d30b33172c1f24e44abd37c30ea71722078b543b58c57a6bc99d64e2a655a5af73fe6edf37c72ab WHIRLPOOL 5c3013fc0b0b8d9209d69aac2b25255c9067167ae3c66a73a36f0ee391dc1b6b482f36b786aa57f361c19d5d26da99ab376c3093c460bc02f3764276e0e7f77a

diff --git a/app-admin/ulogd/files/ulogd-2.0.5-remove-db-automagic.patch b/app-admin/ulogd/files/ulogd-2.0.5-remove-db-automagic.patch
deleted file mode 100644
index dfa5111..00000000
--- a/app-admin/ulogd/files/ulogd-2.0.5-remove-db-automagic.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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], [], [:])

diff --git a/app-admin/ulogd/ulogd-2.0.5-r3.ebuild b/app-admin/ulogd/ulogd-2.0.5-r3.ebuild
deleted file mode 100644
index 31cbd52..00000000
--- a/app-admin/ulogd/ulogd-2.0.5-r3.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils flag-o-matic linux-info readme.gentoo systemd user
-
-DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
-HOMEPAGE="https://netfilter.org/projects/ulogd/index.html"
-SRC_URI="
-	https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
-	ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86"
-IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite -ulog"
-
-RDEPEND="
-	|| ( net-firewall/iptables net-firewall/nftables )
-	>=net-libs/libnfnetlink-1.0.1
-	dbi? ( dev-db/libdbi )
-	json? ( dev-libs/jansson )
-	nfacct? (
-		>=net-libs/libmnl-1.0.3
-		>=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:= )
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${RDEPEND}
-	doc? (
-		app-text/linuxdoc-tools
-		app-text/texlive-core
-		virtual/latex-base
-	)
-"
-
-DOCS=( AUTHORS README TODO )
-
-PATCHES=( "${FILESDIR}/${P}-remove-db-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 "ulogd requires kernel newer than 2.6.14"
-	fi
-
-	if kernel_is lt 2 6 18; then
-		ewarn "You are using kernel older than 2.6.18"
-		ewarn "Some ulogd features may be unavailable"
-	fi
-
-	if use nfacct && kernel_is lt 3 3 0; then
-		ewarn "NFACCT input plugin requires kernel newer than 3.3.0"
-	fi
-
-	if use ulog && kernel_is gt 3 17 0; then
-		ewarn "ULOG target was removed since 3.17.0 kernel release"
-		ewarn "Consider enabling NFACCT, NFCT or NFLOG support"
-	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
-
-	append-lfs-flags
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with dbi)
-		$(use_with json jansson)
-		$(use_enable nfacct)
-		$(use_enable nfct)
-		$(use_enable nflog)
-		$(use_with mysql)
-		$(use_with pcap)
-		$(use_with postgres pgsql)
-		$(use_with sqlite)
-		$(use_enable ulog)
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-
-	if use doc; then
-		# Prevent access violations from bitmap font files generation
-		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,ps,txt}
-	fi
-
-	use mysql && dodoc doc/mysql-*.sql
-	use postgres && dodoc doc/pgsql-*.sql
-	use sqlite && dodoc doc/sqlite3.table
-
-	doman ${PN}.8
-
-	insinto /etc
-	doins "${BUILD_DIR}/${PN}.conf"
-	fowners root:ulogd /etc/${PN}.conf
-	fperms 640 /etc/${PN}.conf
-
-	newinitd "${FILESDIR}/${PN}.init" ${PN}
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	diropts -o ulogd -g ulogd
-	keepdir /var/log/ulogd
-}