Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/ulogd/
Date: Thu, 26 Nov 2015 10:07:42
Message-Id: 1448502170.5297a0a554c186ce9ea68ae68766d84c0bb42f7a.monsieurp@gentoo
1 commit: 5297a0a554c186ce9ea68ae68766d84c0bb42f7a
2 Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
3 AuthorDate: Thu Nov 26 01:14:48 2015 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 26 01:42:50 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5297a0a5
7
8 app-admin/ulogd: minor ebuild updates
9
10 - Use HTTPS site for HOMEPAGE
11 - Add and prefer HTTPS mirror in SRC_URI
12 - Make DOCS stand out
13 - Remove unneeded die message
14 - Do not hardcode paths
15
16 app-admin/ulogd/ulogd-2.0.5-r2.ebuild | 8 +++++---
17 app-admin/ulogd/ulogd-2.0.5-r3.ebuild | 18 +++++++++++-------
18 2 files changed, 16 insertions(+), 10 deletions(-)
19
20 diff --git a/app-admin/ulogd/ulogd-2.0.5-r2.ebuild b/app-admin/ulogd/ulogd-2.0.5-r2.ebuild
21 index 93ce811..5f61107 100644
22 --- a/app-admin/ulogd/ulogd-2.0.5-r2.ebuild
23 +++ b/app-admin/ulogd/ulogd-2.0.5-r2.ebuild
24 @@ -10,9 +10,11 @@ AUTOTOOLS_IN_SOURCE_BUILD=1
25 inherit autotools-utils eutils flag-o-matic linux-info readme.gentoo systemd user
26
27 DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
28 -HOMEPAGE="http://netfilter.org/projects/ulogd/index.html"
29 -SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2
30 - http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
31 +HOMEPAGE="https://netfilter.org/projects/ulogd/index.html"
32 +SRC_URI="
33 + https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
34 + ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2
35 +"
36
37 LICENSE="GPL-2"
38 SLOT="0"
39
40 diff --git a/app-admin/ulogd/ulogd-2.0.5-r3.ebuild b/app-admin/ulogd/ulogd-2.0.5-r3.ebuild
41 index 599d0c9..b39dca2 100644
42 --- a/app-admin/ulogd/ulogd-2.0.5-r3.ebuild
43 +++ b/app-admin/ulogd/ulogd-2.0.5-r3.ebuild
44 @@ -9,9 +9,11 @@ AUTOTOOLS_AUTORECONF=1
45 inherit autotools-utils eutils flag-o-matic linux-info readme.gentoo systemd user
46
47 DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
48 -HOMEPAGE="http://netfilter.org/projects/ulogd/index.html"
49 -SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2
50 - http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
51 +HOMEPAGE="https://netfilter.org/projects/ulogd/index.html"
52 +SRC_URI="
53 + https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
54 + ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2
55 +"
56
57 LICENSE="GPL-2"
58 SLOT="0"
59 @@ -42,9 +44,10 @@ DEPEND="${RDEPEND}
60 )
61 "
62
63 +DOCS=( AUTHORS README TODO )
64 +
65 PATCHES=( "${FILESDIR}/${P}-remove-db-automagic.patch" )
66
67 -DOCS=( AUTHORS README TODO )
68 DOC_CONTENTS="
69 You must have at least one logging stack enabled to make ulogd work.
70 Please edit example configuration located at /etc/ulogd.conf
71 @@ -81,7 +84,7 @@ src_prepare() {
72 sed -i \
73 -e 's:var/log:var/log/ulogd:g' \
74 -e 's:tmp:run:g' \
75 - ulogd.conf.in || die 'sed on ulogd.conf.in failed'
76 + ulogd.conf.in || die
77
78 append-lfs-flags
79 autotools-utils_src_prepare
80 @@ -126,12 +129,13 @@ src_install() {
81 use mysql && dodoc doc/mysql-*.sql
82 use postgres && dodoc doc/pgsql-*.sql
83 use sqlite && dodoc doc/sqlite3.table
84 +
85 doman ${PN}.8
86
87 insinto /etc
88 doins "${BUILD_DIR}/${PN}.conf"
89 - fowners root:ulogd /etc/ulogd.conf
90 - fperms 640 /etc/ulogd.conf
91 + fowners root:ulogd /etc/${PN}.conf
92 + fperms 640 /etc/${PN}.conf
93
94 newinitd "${FILESDIR}/${PN}.init-r2" ${PN}
95 systemd_newunit "${FILESDIR}/${PN}.service-r1" ${PN}.service