[gentoo-commits] gentoo-x86 commit in app-admin/ulogd: ulogd-2.0.0_beta4.ebuild ChangeLog ulogd-1.23-r1.ebuild ulogd-1.24-r2.ebuild ulogd-2.0.0_beta3.ebuild ulogd-1.24-r1.ebuild

[Stephanie J. Lockwood-Childs (wormo)]

wormo       10/10/07 05:31:53

  Modified:             ChangeLog ulogd-1.23-r1.ebuild ulogd-1.24-r2.ebuild
  Added:                ulogd-2.0.0_beta4.ebuild
  Removed:              ulogd-2.0.0_beta3.ebuild ulogd-1.24-r1.ebuild
  Log:
    Cleaning out a couple old versions though still keeping other
    old versions for now (1.23-r1 is stale but only one marked stable,
    1.24-r2 is only with working sqlite feature). Old versions
    now check whether build kernel is too new (various compile failures
    occur with kernels 2.6.31 or newer).
    Version bump for bug #328627.
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.64                 app-admin/ulogd/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/ulogd/ChangeLog?rev=1.64&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/ulogd/ChangeLog?rev=1.64&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/ulogd/ChangeLog?r1=1.63&r2=1.64

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- ChangeLog	17 Jun 2010 20:00:40 -0000	1.63
+++ ChangeLog	7 Oct 2010 05:31:53 -0000	1.64
@@ -1,6 +1,18 @@
 # ChangeLog for app-admin/ulogd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.63 2010/06/17 20:00:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.64 2010/10/07 05:31:53 wormo Exp $
+
+*ulogd-2.0.0_beta4 (07 Oct 2010)
+
+  07 Oct 2010; Stephanie Lockwood-Childs <wormo@g.o>
+  ulogd-1.23-r1.ebuild, -ulogd-1.24-r1.ebuild, ulogd-1.24-r2.ebuild,
+  -ulogd-2.0.0_beta3.ebuild, +ulogd-2.0.0_beta4.ebuild:
+  Cleaning out a couple old versions though still keeping other 
+  old versions for now (1.23-r1 is stale but only one marked stable, 
+  1.24-r2 is only with working sqlite feature). Old versions
+  now check whether build kernel is too new (various compile failures
+  occur with kernels 2.6.31 or newer).
+  Version bump for bug #328627. 
 
   17 Jun 2010; Patrick Lauer <patrick@g.o> ulogd-1.23-r1.ebuild,
   ulogd-1.24-r1.ebuild, ulogd-1.24-r2.ebuild, ulogd-2.0.0_beta3.ebuild:



1.7                  app-admin/ulogd/ulogd-1.23-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/ulogd/ulogd-1.23-r1.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/ulogd/ulogd-1.23-r1.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/ulogd/ulogd-1.23-r1.ebuild?r1=1.6&r2=1.7

Index: ulogd-1.23-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.23-r1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ulogd-1.23-r1.ebuild	17 Jun 2010 20:00:40 -0000	1.6
+++ ulogd-1.23-r1.ebuild	7 Oct 2010 05:31:53 -0000	1.7
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.23-r1.ebuild,v 1.6 2010/06/17 20:00:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.23-r1.ebuild,v 1.7 2010/10/07 05:31:53 wormo Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic linux-info
 
 DESCRIPTION="iptables daemon for ULOG target for userspace iptables filter logging"
 SRC_URI="http://ftp.netfilter.org/pub/ulogd/${P}.tar.bz2
@@ -18,6 +18,14 @@
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql-server )"
 
+pkg_setup() {
+	# can't depend on supported kernel versions because dependencies 
+	# on virtuals are not versioned
+	linux-info_pkg_setup
+	kernel_is lt 2 6 14 && die "requires at least 2.6.14 kernel version"
+	kernel_is ge 2 6 31 && die "kernel version is too new -- try a newer ulogd"
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"



1.3                  app-admin/ulogd/ulogd-1.24-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/ulogd/ulogd-1.24-r2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/ulogd/ulogd-1.24-r2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/ulogd/ulogd-1.24-r2.ebuild?r1=1.2&r2=1.3

Index: ulogd-1.24-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.24-r2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ulogd-1.24-r2.ebuild	17 Jun 2010 20:00:40 -0000	1.2
+++ ulogd-1.24-r2.ebuild	7 Oct 2010 05:31:53 -0000	1.3
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.24-r2.ebuild,v 1.2 2010/06/17 20:00:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.24-r2.ebuild,v 1.3 2010/10/07 05:31:53 wormo Exp $
 
 EAPI="1"
 
-inherit eutils flag-o-matic autotools
+inherit eutils flag-o-matic autotools linux-info
 
 DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
 HOMEPAGE="http://netfilter.org/projects/ulogd/index.html"
@@ -24,6 +24,12 @@
 	net-libs/libpcap"
 
 pkg_setup() {
+	# can't depend on supported kernel versions because dependencies 
+	# on virtuals are not versioned
+	linux-info_pkg_setup
+	kernel_is lt 2 6 14 && die "requires at least 2.6.14 kernel version"
+	kernel_is ge 2 6 31 && die "kernel version is too new -- try a newer ulogd"
+
 	enewgroup ulogd
 	enewuser ulogd -1 -1 /var/log/ulogd ulogd
 }



1.1                  app-admin/ulogd/ulogd-2.0.0_beta4.ebuild

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

Index: ulogd-2.0.0_beta4.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-2.0.0_beta4.ebuild,v 1.1 2010/10/07 05:31:53 wormo Exp $

EAPI="1"

inherit eutils

MY_P=${P/_/}
S="${WORKDIR}/${MY_P}"

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}/${MY_P}.tar.bz2"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ia64 ~ppc -sparc ~x86"
# sqlite not supported in ulogd-2 yet
IUSE="doc mysql postgres pcap" # sqlite

RDEPEND="net-firewall/iptables
	>=net-libs/libnfnetlink-0.0.39
	>=net-libs/libnetfilter_conntrack-0.0.95
	>=net-libs/libnetfilter_log-1.0
	mysql? ( virtual/mysql )
	postgres? ( dev-db/postgresql-base )
	pcap? ( net-libs/libpcap )"
	#sqlite? ( dev-db/sqlite:3 )

DEPEND="${RDEPEND}
	sys-devel/autoconf:2.5
	doc? (
			app-text/linuxdoc-tools
			app-text/texlive-core
		 )"

pkg_setup() {
	enewgroup ulogd
	enewuser ulogd -1 -1 /var/log/ulogd ulogd
}

src_compile() {
	econf \
		$(use_with mysql) \
		$(use_with postgres pgsql) \
		$(use_with pcap pcap /usr) \
		--without-sqlite3 #$(use_with sqlite sqlite3)

	emake || die "emake failed"

	if use doc ; then
		# build extra documentation files (.ps, .txt, .html, .dvi)

		# prevent access violations from generation of bitmap font files
		export VARTEXFONTS="${T}"
		emake -C doc || die "emake for docs failed"
	fi
}

src_install() {
	emake install DESTDIR="${D}" || die "emake install failed"

	doinitd "${FILESDIR}"/ulogd || die "doinitd failed"

	insinto /etc
	doins ulogd.conf || die "ulogd.conf installation failed"

	dodoc AUTHORS README

	if use doc ; then
		dohtml doc/ulogd.html
		dodoc doc/ulogd.dvi
		dodoc doc/ulogd.txt
		dodoc doc/ulogd.ps
	fi

	use mysql && dodoc doc/mysql-ulogd2.sql
	use postgres && dodoc doc/pgsql-ulogd2.sql
	#use sqlite && dodoc doc/sqlite3.table

	# install logrotate config
	insinto /etc/logrotate.d
	newins ulogd.logrotate ulogd || die "logrotate config failed"

	doman ulogd.8 || die
}

pkg_postinst() {
	chown root:ulogd "${ROOT}"/etc/ulogd.conf
	chmod 640        "${ROOT}"/etc/ulogd.conf
}