public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-admin/ulogd/files/, app-admin/ulogd/
@ 2015-09-21  7:43 Ian Delaney
  0 siblings, 0 replies; 4+ messages in thread
From: Ian Delaney @ 2015-09-21  7:43 UTC (permalink / raw
  To: gentoo-commits

commit:     d108e160bd54bc10ebb7c3697e214b3b2c8c7eb9
Author:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 07:14:27 2015 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 07:43:40 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d108e160

app-admin/ulogd: revbump to -2.0.5-r2

Update ebuild to support nftables, Update OpenRC initscript to accommodate
nftables, update systemd service file to start ulogd before ebtables and
nftables, patches submitted by maintainer via, and closes, bug #560470
removed defunct -2.0.5, -2.0.5-r1

Package-Manager: portage-2.2.20.1

 app-admin/ulogd/files/ulogd.init-r1                |  41 ++++++
 app-admin/ulogd/files/ulogd.service-r1             |  13 ++
 ...ulogd-2.0.5-r1.ebuild => ulogd-2.0.5-r2.ebuild} |  25 ++--
 app-admin/ulogd/ulogd-2.0.5.ebuild                 | 141 ---------------------
 4 files changed, 68 insertions(+), 152 deletions(-)

diff --git a/app-admin/ulogd/files/ulogd.init-r1 b/app-admin/ulogd/files/ulogd.init-r1
new file mode 100644
index 0000000..47a0674
--- /dev/null
+++ b/app-admin/ulogd/files/ulogd.init-r1
@@ -0,0 +1,41 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 nftables 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 $?
+}

diff --git a/app-admin/ulogd/files/ulogd.service-r1 b/app-admin/ulogd/files/ulogd.service-r1
new file mode 100644
index 0000000..e6c88fb
--- /dev/null
+++ b/app-admin/ulogd/files/ulogd.service-r1
@@ -0,0 +1,13 @@
+[Unit]
+Description=A userspace logging daemon for netfilter/iptables related logging
+Before=iptables.service ip6tables.service ebtables.service nftables.service
+After=mysql.service postgresql.service
+
+[Service]
+Type=forking
+PIDFile=/run/ulogd.pid
+ExecStart=/usr/sbin/ulogd --daemon --uid ulogd --pidfile /run/ulogd.pid
+ExecReload=/bin/kill -USR1 $MAINPID
+
+[Install]
+WantedBy=network.target

diff --git a/app-admin/ulogd/ulogd-2.0.5-r1.ebuild b/app-admin/ulogd/ulogd-2.0.5-r2.ebuild
similarity index 85%
rename from app-admin/ulogd/ulogd-2.0.5-r1.ebuild
rename to app-admin/ulogd/ulogd-2.0.5-r2.ebuild
index 0115be0..2fc5a7e 100644
--- a/app-admin/ulogd/ulogd-2.0.5-r1.ebuild
+++ b/app-admin/ulogd/ulogd-2.0.5-r2.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
 IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite -ulog"
 
 RDEPEND="
-	net-firewall/iptables
+	|| ( net-firewall/iptables net-firewall/nftables )
 	>=net-libs/libnfnetlink-1.0.1
 	dbi? ( dev-db/libdbi )
 	json? ( dev-libs/jansson )
@@ -33,20 +33,23 @@ RDEPEND="
 	mysql? ( virtual/mysql )
 	pcap? ( net-libs/libpcap )
 	postgres? ( dev-db/postgresql:= )
-	sqlite? ( dev-db/sqlite:3 )"
-
+	sqlite? ( dev-db/sqlite:3 )
+"
 DEPEND="${RDEPEND}
 	doc? (
 		app-text/linuxdoc-tools
 		app-text/texlive-core
 		virtual/latex-base
-	)"
+	)
+"
 
 PATCHES=( "${FILESDIR}/${P}-remove-db-automagic.patch" )
 
 DOCS=( AUTHORS README TODO )
-DOC_CONTENTS="You must have at least one logging stack enabled to make ulogd work.
-Please edit example configuration located at /etc/ulogd.conf"
+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
@@ -55,12 +58,12 @@ pkg_setup() {
 	linux-info_pkg_setup
 
 	if kernel_is lt 2 6 14; then
-		die "ulogd2 requires kernel newer than 2.6.14"
+		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 ulogd2 features may be unavailable"
+		ewarn "Some ulogd features may be unavailable"
 	fi
 
 	if use nfacct && kernel_is lt 3 3 0; then
@@ -105,7 +108,7 @@ src_compile() {
 	autotools-utils_src_compile
 
 	if use doc; then
-		# prevent access violations from generation of bitmap font files
+		# Prevent access violations from bitmap font files generation
 		export VARTEXFONTS="${T}"/fonts
 		emake -C doc
 	fi
@@ -131,8 +134,8 @@ src_install() {
 	fowners root:ulogd /etc/ulogd.conf
 	fperms 640 /etc/ulogd.conf
 
-	newinitd "${FILESDIR}/${PN}.init" ${PN}
-	systemd_dounit "${FILESDIR}/${PN}.service"
+	newinitd "${FILESDIR}/${PN}.init-r1" ${PN}
+	systemd_newunit "${FILESDIR}/${PN}.service-r1" ${PN}.service
 
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}/${PN}.logrotate" ${PN}

diff --git a/app-admin/ulogd/ulogd-2.0.5.ebuild b/app-admin/ulogd/ulogd-2.0.5.ebuild
deleted file mode 100644
index 0822bd7..0000000
--- a/app-admin/ulogd/ulogd-2.0.5.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils eutils linux-info readme.gentoo systemd user
-
-DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
-HOMEPAGE="http://netfilter.org/projects/ulogd/index.html"
-SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2
-		http://www.netfilter.org/projects/${PN}/files/${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-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
-	)"
-
-PATCHES=( "${FILESDIR}/${P}-remove-db-automagic.patch" )
-
-DOCS=( AUTHORS README TODO )
-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 "You are using kernel older than 2.6.18"
-		ewarn "Some ulogd2 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 'sed on ulogd.conf.in failed'
-
-	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 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}.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
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/ulogd/files/, app-admin/ulogd/
@ 2015-11-03  8:42 Ian Delaney
  0 siblings, 0 replies; 4+ messages in thread
From: Ian Delaney @ 2015-11-03  8:42 UTC (permalink / raw
  To: gentoo-commits

commit:     0c147c1277d6c4777b0353683d0a419fc277b5a8
Author:     Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Fri Oct 30 14:01:24 2015 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Fri Oct 30 16:26:21 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c147c12

app-admin/ulogd: remove old

 app-admin/ulogd/Manifest                           |   1 -
 .../ulogd-2.0.4-linux-headers-3.17-ipt_ulog.patch  | 100 ---------------
 app-admin/ulogd/files/ulogd.init                   |  41 ------
 app-admin/ulogd/files/ulogd.service                |  13 --
 app-admin/ulogd/ulogd-2.0.4-r1.ebuild              | 140 ---------------------
 5 files changed, 295 deletions(-)

diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index 8392508..d969037 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -1,2 +1 @@
-DIST ulogd-2.0.4.tar.bz2 452234 SHA256 56b30a13a8832e97178f39b7bb173a0b1dfe173dbb60d99a1a386c0962a2effd SHA512 08e88661fcfbcfd327b03b7a883dc239991f47d5a4e4561f3ada5f6acc8f2349f3bd38c1c67f28e42bbccf4cad63b2b7c3b732c23bf24b7c5f05320d27977773 WHIRLPOOL 94ee731cee8b95295d1c675bb3904be1a5b27a1e901d462f248116c865e79d52703b5330882110d7212bda1bb964fc0c97c3e704589071f47fab4475e1c91161
 DIST ulogd-2.0.5.tar.bz2 456258 SHA256 a221cb9f77347c0ca00d0937e27c1b90e3291a553cc62a4139b788e2e420e8c0 SHA512 bf00b8adaad7bd04077a83521b0d7accc26e644c8f3386819e7f91476178b6733f1c6554fb82dd0d3913398c83a61d65f61dc973f199f610bfaadc6251504819 WHIRLPOOL fe499ac7b4070581439a05f4f2245f7a42fe5630da5dc32b9b069511ed1faa15fe482eee08d50477d3fb1d0bf0d3855a69fc82fb0f3e8eecdf082fb642519f91

diff --git a/app-admin/ulogd/files/ulogd-2.0.4-linux-headers-3.17-ipt_ulog.patch b/app-admin/ulogd/files/ulogd-2.0.4-linux-headers-3.17-ipt_ulog.patch
deleted file mode 100644
index f8c1062..0000000
--- a/app-admin/ulogd/files/ulogd-2.0.4-linux-headers-3.17-ipt_ulog.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 30e24dbfc7a8644e29664070e8c16e5c3997f87e Mon Sep 17 00:00:00 2001
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-Date: Fri, 7 Nov 2014 18:33:01 +0100
-Subject: [PATCH] include: keep a copy of linux/netfilter_ipv4/ipt_ULOG.h
-
-This fixes compilation if you use a Linux kernel >= 3.17. This problem
-occurs since ULOG was removed from mainstream:
-
-http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=7200135bc1e61f1437dc326ae2ef2f310c50b4eb
-
-Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=986
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-
-diff --git a/configure.ac b/configure.ac
-index 522c345..c5f573c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -142,7 +142,7 @@ dnl AM_CONDITIONAL(HAVE_PGSQL, test x$pgsqldir != x)
- 
- AC_CONFIG_FILES(include/Makefile include/ulogd/Makefile include/libipulog/Makefile \
- 	  include/linux/Makefile include/linux/netfilter/Makefile \
--	  libipulog/Makefile \
-+	  include/linux/netfilter_ipv4/Makefile libipulog/Makefile \
- 	  input/Makefile input/packet/Makefile input/flow/Makefile \
- 	  input/sum/Makefile \
- 	  filter/Makefile filter/raw2packet/Makefile filter/packet2flow/Makefile \
-diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
-index ca80d0d..18af1c2 100644
---- a/include/linux/Makefile.am
-+++ b/include/linux/Makefile.am
-@@ -1,2 +1,2 @@
--
--SUBDIRS = netfilter
-+SUBDIRS = netfilter		\
-+	  netfilter_ipv4
-diff --git a/include/linux/netfilter_ipv4/Makefile.am b/include/linux/netfilter_ipv4/Makefile.am
-new file mode 100644
-index 0000000..41819a3
---- /dev/null
-+++ b/include/linux/netfilter_ipv4/Makefile.am
-@@ -0,0 +1 @@
-+noinst_HEADERS = ipt_ULOG.h
-diff --git a/include/linux/netfilter_ipv4/ipt_ULOG.h b/include/linux/netfilter_ipv4/ipt_ULOG.h
-new file mode 100644
-index 0000000..417aad2
---- /dev/null
-+++ b/include/linux/netfilter_ipv4/ipt_ULOG.h
-@@ -0,0 +1,49 @@
-+/* Header file for IP tables userspace logging, Version 1.8
-+ *
-+ * (C) 2000-2002 by Harald Welte <laforge@gnumonks.org>
-+ * 
-+ * Distributed under the terms of GNU GPL */
-+
-+#ifndef _IPT_ULOG_H
-+#define _IPT_ULOG_H
-+
-+#ifndef NETLINK_NFLOG
-+#define NETLINK_NFLOG 	5
-+#endif
-+
-+#define ULOG_DEFAULT_NLGROUP	1
-+#define ULOG_DEFAULT_QTHRESHOLD	1
-+
-+#define ULOG_MAC_LEN	80
-+#define ULOG_PREFIX_LEN	32
-+
-+#define ULOG_MAX_QLEN	50
-+/* Why 50? Well... there is a limit imposed by the slab cache 131000
-+ * bytes. So the multipart netlink-message has to be < 131000 bytes.
-+ * Assuming a standard ethernet-mtu of 1500, we could define this up
-+ * to 80... but even 50 seems to be big enough. */
-+
-+/* private data structure for each rule with a ULOG target */
-+struct ipt_ulog_info {
-+	unsigned int nl_group;
-+	size_t copy_range;
-+	size_t qthreshold;
-+	char prefix[ULOG_PREFIX_LEN];
-+};
-+
-+/* Format of the ULOG packets passed through netlink */
-+typedef struct ulog_packet_msg {
-+	unsigned long mark;
-+	long timestamp_sec;
-+	long timestamp_usec;
-+	unsigned int hook;
-+	char indev_name[IFNAMSIZ];
-+	char outdev_name[IFNAMSIZ];
-+	size_t data_len;
-+	char prefix[ULOG_PREFIX_LEN];
-+	unsigned char mac_len;
-+	unsigned char mac[ULOG_MAC_LEN];
-+	unsigned char payload[0];
-+} ulog_packet_msg_t;
-+
-+#endif /*_IPT_ULOG_H*/
--- 
-2.0.4
-

diff --git a/app-admin/ulogd/files/ulogd.init b/app-admin/ulogd/files/ulogd.init
deleted file mode 100644
index ace6e8b..0000000
--- a/app-admin/ulogd/files/ulogd.init
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 $?
-}

diff --git a/app-admin/ulogd/files/ulogd.service b/app-admin/ulogd/files/ulogd.service
deleted file mode 100644
index ec22db0..0000000
--- a/app-admin/ulogd/files/ulogd.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=A userspace logging daemon for netfilter/iptables related logging
-Before=iptables.service ip6tables.service
-After=mysql.service postgresql.service
-
-[Service]
-Type=forking
-PIDFile=/run/ulogd.pid
-ExecStart=/usr/sbin/ulogd --daemon --uid ulogd --pidfile /run/ulogd.pid
-ExecReload=/bin/kill -USR1 $MAINPID
-
-[Install]
-WantedBy=network.target

diff --git a/app-admin/ulogd/ulogd-2.0.4-r1.ebuild b/app-admin/ulogd/ulogd-2.0.4-r1.ebuild
deleted file mode 100644
index a49fa02..0000000
--- a/app-admin/ulogd/ulogd-2.0.4-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils eutils linux-info readme.gentoo systemd user
-
-DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
-HOMEPAGE="http://netfilter.org/projects/ulogd/index.html"
-SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2
-		http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86"
-IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite"
-
-RDEPEND="net-firewall/iptables
-	>=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
-	)"
-
-PATCHES=( "${FILESDIR}/${P}-linux-headers-3.17-ipt_ulog.patch" )
-
-DOCS=( AUTHORS README TODO )
-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
-
-	if ! use nfacct && ! use nfct && ! use nflog && 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 'sed on ulogd.conf.in failed'
-
-	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)
-	)
-	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}.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
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/ulogd/files/, app-admin/ulogd/
@ 2015-12-28  9:56 Patrice Clement
  0 siblings, 0 replies; 4+ messages in thread
From: Patrice Clement @ 2015-12-28  9:56 UTC (permalink / raw
  To: gentoo-commits

commit:     16ca585379829b7eb64a350679d51cca9a104286
Author:     Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Sun Dec 27 19:57:28 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 21:29:51 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16ca5853

app-admin/ulogd: drop obsolete initscript and systemd unit suffixes

Package-Manager: portage-2.2.24

 app-admin/ulogd/files/{ulogd.init-r2 => ulogd.init}       | 0
 app-admin/ulogd/files/{ulogd.service-r1 => ulogd.service} | 0
 app-admin/ulogd/ulogd-2.0.5-r3.ebuild                     | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-admin/ulogd/files/ulogd.init-r2 b/app-admin/ulogd/files/ulogd.init
similarity index 100%
rename from app-admin/ulogd/files/ulogd.init-r2
rename to app-admin/ulogd/files/ulogd.init

diff --git a/app-admin/ulogd/files/ulogd.service-r1 b/app-admin/ulogd/files/ulogd.service
similarity index 100%
rename from app-admin/ulogd/files/ulogd.service-r1
rename to app-admin/ulogd/files/ulogd.service

diff --git a/app-admin/ulogd/ulogd-2.0.5-r3.ebuild b/app-admin/ulogd/ulogd-2.0.5-r3.ebuild
index cb3beb6..31cbd52 100644
--- a/app-admin/ulogd/ulogd-2.0.5-r3.ebuild
+++ b/app-admin/ulogd/ulogd-2.0.5-r3.ebuild
@@ -137,8 +137,8 @@ src_install() {
 	fowners root:ulogd /etc/${PN}.conf
 	fperms 640 /etc/${PN}.conf
 
-	newinitd "${FILESDIR}/${PN}.init-r2" ${PN}
-	systemd_newunit "${FILESDIR}/${PN}.service-r1" ${PN}.service
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+	systemd_dounit "${FILESDIR}/${PN}.service"
 
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}/${PN}.logrotate" ${PN}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/ulogd/files/, app-admin/ulogd/
@ 2016-08-30 16:29 Patrice Clement
  0 siblings, 0 replies; 4+ messages in thread
From: Patrice Clement @ 2016-08-30 16:29 UTC (permalink / raw
  To: gentoo-commits

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@gnumonks.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
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-08-30 16:29 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-03  8:42 [gentoo-commits] repo/gentoo:master commit in: app-admin/ulogd/files/, app-admin/ulogd/ Ian Delaney
  -- strict thread matches above, loose matches on Subject: below --
2016-08-30 16:29 Patrice Clement
2015-12-28  9:56 Patrice Clement
2015-09-21  7:43 Ian Delaney

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox