summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Stine <battousai@gentoo.org>2005-07-31 03:09:02 +0000
committerBryan Stine <battousai@gentoo.org>2005-07-31 03:09:02 +0000
commit86ae50773f60157b47c980a02e165c38d28b2269 (patch)
tree41f5b082d3faa61f1b31b91734ccfb22e7acff87 /net-firewall/psad/psad-1.4.0.ebuild
parentchanged by mistake (diff)
downloadgentoo-2-86ae50773f60157b47c980a02e165c38d28b2269.tar.gz
gentoo-2-86ae50773f60157b47c980a02e165c38d28b2269.tar.bz2
gentoo-2-86ae50773f60157b47c980a02e165c38d28b2269.zip
Bump to 1.4.2. Closes bug #90544.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'net-firewall/psad/psad-1.4.0.ebuild')
-rw-r--r--net-firewall/psad/psad-1.4.0.ebuild7
1 files changed, 4 insertions, 3 deletions
diff --git a/net-firewall/psad/psad-1.4.0.ebuild b/net-firewall/psad/psad-1.4.0.ebuild
index de9859dd1434..e7ab447d1346 100644
--- a/net-firewall/psad/psad-1.4.0.ebuild
+++ b/net-firewall/psad/psad-1.4.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.4.0.ebuild,v 1.4 2005/01/08 00:07:49 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.4.0.ebuild,v 1.5 2005/07/31 03:09:02 battousai Exp $
inherit eutils perl-module
@@ -140,8 +140,9 @@ fix_psad_conf() {
cp psad.conf psad.conf.orig
# Ditch the _CHANGEME_ for hostname, substituting in our real hostname
- myhostname="$(< /etc/hostname)"
- [ -e /etc/dnsdomainname ] && mydomain=".$(< /etc/dnsdomainname)"
+ [ -e /etc/hostname ] && myhostname="$(< /etc/hostname)"
+ [ "${myhostname}" == "" ] && myhostname="$HOSTNAME"
+ mydomain=".$(grep domain /etc/resolv.conf | cut -d" " -f2)"
sed -i "s:HOSTNAME\(.\+\)\_CHANGEME\_;:HOSTNAME\1${myhostname}${mydomain};:" psad.conf || die "fix_psad_conf failed"
# Fix up paths