commit:     5297a0a554c186ce9ea68ae68766d84c0bb42f7a
Author:     Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Thu Nov 26 01:14:48 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 01:42:50 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5297a0a5

app-admin/ulogd: minor ebuild updates

- Use HTTPS site for HOMEPAGE
- Add and prefer HTTPS mirror in SRC_URI
- Make DOCS stand out
- Remove unneeded die message
- Do not hardcode paths

 app-admin/ulogd/ulogd-2.0.5-r2.ebuild |  8 +++++---
 app-admin/ulogd/ulogd-2.0.5-r3.ebuild | 18 +++++++++++-------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/app-admin/ulogd/ulogd-2.0.5-r2.ebuild 
b/app-admin/ulogd/ulogd-2.0.5-r2.ebuild
index 93ce811..5f61107 100644
--- a/app-admin/ulogd/ulogd-2.0.5-r2.ebuild
+++ b/app-admin/ulogd/ulogd-2.0.5-r2.ebuild
@@ -10,9 +10,11 @@ AUTOTOOLS_IN_SOURCE_BUILD=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="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";
+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"

diff --git a/app-admin/ulogd/ulogd-2.0.5-r3.ebuild 
b/app-admin/ulogd/ulogd-2.0.5-r3.ebuild
index 599d0c9..b39dca2 100644
--- a/app-admin/ulogd/ulogd-2.0.5-r3.ebuild
+++ b/app-admin/ulogd/ulogd-2.0.5-r3.ebuild
@@ -9,9 +9,11 @@ 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="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";
+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"
@@ -42,9 +44,10 @@ DEPEND="${RDEPEND}
        )
 "
 
+DOCS=( AUTHORS README TODO )
+
 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
@@ -81,7 +84,7 @@ src_prepare() {
        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'
+               ulogd.conf.in || die
 
        append-lfs-flags
        autotools-utils_src_prepare
@@ -126,12 +129,13 @@ src_install() {
        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/ulogd.conf
-       fperms 640 /etc/ulogd.conf
+       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

Reply via email to