idella4     15/05/30 09:38:29

  Modified:             ChangeLog metadata.xml
  Added:                ulogd-2.0.5.ebuild ulogd-2.0.4-r1.ebuild
  Removed:              ulogd-2.0.3.ebuild
  Log:
  revbump; upgrade -2.0.4 with support of systemd via new system files listed. 
bump; additional support as for revbump, all files and patches by maintainer 
from bug #550330, add use flag ulog to metadata, rm old version -2.0.3
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 
0xB8072B0D)

Revision  Changes    Path
1.98                 app-admin/ulogd/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- ChangeLog   28 Jan 2015 10:26:01 -0000      1.97
+++ ChangeLog   30 May 2015 09:38:29 -0000      1.98
@@ -1,6 +1,18 @@
 # ChangeLog for app-admin/ulogd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.97 2015/01/28 
10:26:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.98 2015/05/30 
09:38:29 idella4 Exp $
+
+*ulogd-2.0.4-r1 (30 May 2015)
+*ulogd-2.0.5 (30 May 2015)
+
+  30 May 2015; Ian Delaney <[email protected]>
+  +files/ulogd-2.0.5-remove-db-automagic.patch, +files/ulogd.init,
+  +files/ulogd.logrotate, +files/ulogd.service, +ulogd-2.0.4-r1.ebuild,
+  +ulogd-2.0.5.ebuild, -files/ulogd-2-ng.init, -files/ulogd-2.logrotate,
+  -ulogd-2.0.3.ebuild, metadata.xml:
+  revbump; upgrade -2.0.4 with support of systemd via new system files listed.
+  bump; additional support as for revbump, all files and patches by maintainer
+  from bug #550330, add use flag ulog to metadata, rm old version -2.0.3
 
   28 Jan 2015; Agostino Sarubbo <[email protected]> ulogd-2.0.4.ebuild:
   Stable for ppc, wrt bug #534240



1.14                 app-admin/ulogd/metadata.xml

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

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/ulogd/metadata.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- metadata.xml        26 Apr 2014 11:34:06 -0000      1.13
+++ metadata.xml        30 May 2015 09:38:29 -0000      1.14
@@ -14,5 +14,6 @@
                <flag name='nflog'>Build NFLOG input plugin to support 
stateless packet-based logging via nfnetlink_queue.</flag>
                <flag name='nfct'>Build NFCT input plugin to support stateful 
flow-based via nf_conntrack_netlink.</flag>
                <flag name='nfacct'>Build NFACCT input plugin to support 
traffic accounting via nfnetlink_acct.</flag>
+               <flag name='ulog'>Build ULOG input plugin to support deprecated 
packet-based logging via ULOG target.</flag>
        </use>
 </pkgmetadata>



1.1                  app-admin/ulogd/ulogd-2.0.5.ebuild

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

Index: ulogd-2.0.5.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-2.0.5.ebuild,v 1.1 
2015/05/30 09:38:29 idella4 Exp $

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
}



1.1                  app-admin/ulogd/ulogd-2.0.4-r1.ebuild

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

Index: ulogd-2.0.4-r1.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-2.0.4-r1.ebuild,v 1.1 
2015/05/30 09:38:29 idella4 Exp $

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
}




Reply via email to