A few fixes and einfo changes. Fixes bug #76966.

6 files changed, 113 insertions, 43 deletions

diff --git a/net-firewall/psad/ChangeLog b/net-firewall/psad/ChangeLog
index db5e47dc9401..3ae11089184a 100644
--- a/net-firewall/psad/ChangeLog
+++ b/net-firewall/psad/ChangeLog
@@ -1,11 +1,18 @@
 # ChangeLog for net-firewall/psad
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.22 2005/01/05 20:46:48 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.23 2005/01/07 03:57:24 battousai Exp $
 
-  05 Jan 2005; Bryan D. Stine <bryan@gentoo.org> psad-1.3.2.ebuild:
+  06 Jan 2005; Bryan D. Stine <battousai@gentoo.org> psad-1.3.1.ebuild,
+  psad-1.3.2.ebuild, psad-1.3.4.ebuild, psad-1.4.0.ebuild:
+  A couple of fixes for unreported bugs. Typo fixes for postinst einfo in
+  1.3.1-1.3.4 ebuilds. Removed that same postinst einfo from 1.4.0 and added
+  detection for different sysloggers, giving conf suggestions for each. Closes
+  bug #76966.
+
+  05 Jan 2005; Bryan D. Stine <battousai@gentoo.org> psad-1.3.2.ebuild:
   x86 stable 1.3.2.
 
-  05 Jan 2005; Bryan D. Stine <bryan@gentoo.org> psad-1.3.1.ebuild,
+  05 Jan 2005; Bryan D. Stine <battousai@gentoo.org> psad-1.3.1.ebuild,
   psad-1.3.2.ebuild, psad-1.3.4.ebuild, psad-1.4.0.ebuild:
   Changed dependancy on mailx to virtual/mailx. Fixes bug #73972.
 
diff --git a/net-firewall/psad/Manifest b/net-firewall/psad/Manifest
index f332b28779dc..9eba78257408 100644
--- a/net-firewall/psad/Manifest
+++ b/net-firewall/psad/Manifest
@@ -1,9 +1,9 @@
-MD5 2177219dd9037be54b4e11c5c79960fe ChangeLog 4294
+MD5 ede4ec4529010f9a0262043ca1d32d5f ChangeLog 4678
 MD5 ac85ccaacab6bf7a9dd356b8c92b3bac metadata.xml 326
-MD5 bb0c7c908f2229eb43468d072b15a862 psad-1.3.1.ebuild 2810
-MD5 128e67c21ea1ed468035102070a893d6 psad-1.3.2.ebuild 2916
-MD5 517a43daeca74b7b8826517bae7b4ce7 psad-1.3.4.ebuild 2939
-MD5 f8a21d8048b5f2d2370d27d7af1b9cec psad-1.4.0.ebuild 2939
+MD5 938dbb3b56c0f7885c3408516e96a3be psad-1.3.1.ebuild 3210
+MD5 997624d60e270565d1b91814f570e0a6 psad-1.3.2.ebuild 3315
+MD5 9e330d67604b9ecdc1af9ab56fd43c5a psad-1.3.4.ebuild 3338
+MD5 c2cd36c80514c5d961c8f029578a28bf psad-1.4.0.ebuild 4032
 MD5 0685c8a54fb4c35dbc920b79c2bea80e files/digest-psad-1.3.1 63
 MD5 d5b2c82c2615fcf24e2f599706e35ade files/digest-psad-1.3.2 63
 MD5 295923dc84bcfb6e5978b5039ffc0a3a files/digest-psad-1.3.4 63
diff --git a/net-firewall/psad/psad-1.3.1.ebuild b/net-firewall/psad/psad-1.3.1.ebuild
index 9ce83b55c8f1..1aa95f7607f5 100644
--- a/net-firewall/psad/psad-1.3.1.ebuild
+++ b/net-firewall/psad/psad-1.3.1.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.3.1.ebuild,v 1.12 2005/01/05 20:22:36 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.3.1.ebuild,v 1.13 2005/01/07 03:57:24 battousai Exp $
 
 inherit eutils perl-module
 
@@ -77,18 +77,14 @@ src_install() {
 
 	cd ${S}
 
-	# Ditch the _CHANGEME_ for hostname, substituting in our real hostname
-	myhostname="$(< /etc/hostname)"
-	[ -e /etc/dnsdomainname ] && mydomain=".$(< /etc/dnsdomainname)"
-	cp psad.conf psad.conf.orig
-	sed -i "s:HOSTNAME\(.\+\)\_CHANGEME\_;:HOSTNAME\1${myhostname}${mydomain};:" psad.conf || die "Sed failed."
+	fix_psad_conf
 
 	insinto /etc/psad
 	doins *.conf
 	doins psad_*
 
 	exeinto /etc/init.d
-	doexe psad-init.gentoo psad
+	newexe psad-init.gentoo psad
 
 	cd ${S}/snort_rules
 	dodir /etc/psad/snort_rules
@@ -114,7 +110,22 @@ pkg_postinst() {
 	einfo "HOME_NET settings at the least."
 	echo
 	einfo "If you are using a logger other than sysklogd, please be sure to change the"
-	einfo "syslogCmd setting in /etc/psad/psad.conf. An example for syslog-ng users"
+	einfo "syslogdCmd setting in /etc/psad/psad.conf. An example for syslog-ng users"
 	einfo "would be:"
-	einfo "		syslogCmd = /usr/sbin/syslog-ng;"
+	einfo "		syslogdCmd	/usr/sbin/syslog-ng;"
+}
+
+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)"
+	sed -i "s:HOSTNAME\(.\+\)\_CHANGEME\_;:HOSTNAME\1${myhostname}${mydomain};:" psad.conf || die "fix_psad_conf failed"
+
+	# Fix up paths
+	sed -i "s:/sbin/syslogd:/usr/sbin/syslogd:g" psad.conf || die "fix_psad_conf failed"
+	sed -i "s:/sbin/syslog-ng:/usr/sbin/syslog-ng:g" psad.conf || die "fix_psad_conf failed"
+	sed -i "s:/bin/uname:/usr/bin/uname:g" psad.conf || die "fix_psad_conf failed"
+	sed -i "s:/bin/mknod:/usr/bin/mknod:g" psad.conf || die "fix_psad_conf failed"
 }
diff --git a/net-firewall/psad/psad-1.3.2.ebuild b/net-firewall/psad/psad-1.3.2.ebuild
index 1717534779f4..3e76363d782c 100644
--- a/net-firewall/psad/psad-1.3.2.ebuild
+++ b/net-firewall/psad/psad-1.3.2.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.3.2.ebuild,v 1.5 2005/01/05 20:46:48 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.3.2.ebuild,v 1.6 2005/01/07 03:57:24 battousai Exp $
 
 inherit eutils perl-module
 
@@ -78,11 +78,7 @@ src_install() {
 
 	cd ${S}
 
-	# Ditch the _CHANGEME_ for hostname, substituting in our real hostname
-	myhostname="$(< /etc/hostname)"
-	[ -e /etc/dnsdomainname ] && mydomain=".$(< /etc/dnsdomainname)"
-	cp psad.conf psad.conf.orig
-	sed -i "s:HOSTNAME\(.\+\)\_CHANGEME\_;:HOSTNAME\1${myhostname}${mydomain};:" psad.conf || die "Sed failed."
+	fix_psad_conf
 
 	insinto /etc/psad
 	doins *.conf
@@ -116,7 +112,22 @@ pkg_postinst() {
 	einfo "HOME_NET settings at the least."
 	echo
 	einfo "If you are using a logger other than sysklogd, please be sure to change the"
-	einfo "syslogCmd setting in /etc/psad/psad.conf. An example for syslog-ng users"
+	einfo "syslogdCmd setting in /etc/psad/psad.conf. An example for syslog-ng users"
 	einfo "would be:"
-	einfo "		syslogCmd = /usr/sbin/syslog-ng;"
+	einfo "		syslogdCmd	/usr/sbin/syslog-ng;"
+}
+
+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)"
+	sed -i "s:HOSTNAME\(.\+\)\_CHANGEME\_;:HOSTNAME\1${myhostname}${mydomain};:" psad.conf || die "fix_psad_conf failed"
+
+	# Fix up paths
+	sed -i "s:/sbin/syslogd:/usr/sbin/syslogd:g" psad.conf || die "fix_psad_conf failed"
+	sed -i "s:/sbin/syslog-ng:/usr/sbin/syslog-ng:g" psad.conf || die "fix_psad_conf failed"
+	sed -i "s:/bin/uname:/usr/bin/uname:g" psad.conf || die "fix_psad_conf failed"
+	sed -i "s:/bin/mknod:/usr/bin/mknod:g" psad.conf || die "fix_psad_conf failed"
 }
diff --git a/net-firewall/psad/psad-1.3.4.ebuild b/net-firewall/psad/psad-1.3.4.ebuild
index a1fe2c3a781a..3cc7ebfb46b5 100644
--- a/net-firewall/psad/psad-1.3.4.ebuild
+++ b/net-firewall/psad/psad-1.3.4.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.3.4.ebuild,v 1.2 2005/01/05 20:22:36 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.3.4.ebuild,v 1.3 2005/01/07 03:57:24 battousai Exp $
 
 inherit eutils perl-module
 
@@ -78,11 +78,7 @@ src_install() {
 
 	cd ${S}
 
-	# Ditch the _CHANGEME_ for hostname, substituting in our real hostname
-	myhostname="$(< /etc/hostname)"
-	[ -e /etc/dnsdomainname ] && mydomain=".$(< /etc/dnsdomainname)"
-	cp psad.conf psad.conf.orig
-	sed -i "s:HOSTNAME\(.\+\)\_CHANGEME\_;:HOSTNAME\1${myhostname}${mydomain};:" psad.conf || die "Sed failed."
+	fix_psad_conf
 
 	insinto /etc/psad
 	doins *.conf
@@ -117,7 +113,22 @@ pkg_postinst() {
 	einfo "HOME_NET settings at the least."
 	echo
 	einfo "If you are using a logger other than sysklogd, please be sure to change the"
-	einfo "syslogCmd setting in /etc/psad/psad.conf. An example for syslog-ng users"
+	einfo "syslogdCmd setting in /etc/psad/psad.conf. An example for syslog-ng users"
 	einfo "would be:"
-	einfo "		syslogCmd = /usr/sbin/syslog-ng;"
+	einfo "		syslogdCmd	/usr/sbin/syslog-ng;"
+}
+
+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)"
+	sed -i "s:HOSTNAME\(.\+\)\_CHANGEME\_;:HOSTNAME\1${myhostname}${mydomain};:" psad.conf || die "fix_psad_conf failed"
+
+	# Fix up paths
+	sed -i "s:/sbin/syslogd:/usr/sbin/syslogd:g" psad.conf || die "fix_psad_conf failed"
+	sed -i "s:/sbin/syslog-ng:/usr/sbin/syslog-ng:g" psad.conf || die "fix_psad_conf failed"
+	sed -i "s:/bin/uname:/usr/bin/uname:g" psad.conf || die "fix_psad_conf failed"
+	sed -i "s:/bin/mknod:/usr/bin/mknod:g" psad.conf || die "fix_psad_conf failed"
 }
diff --git a/net-firewall/psad/psad-1.4.0.ebuild b/net-firewall/psad/psad-1.4.0.ebuild
index 0abcb3765596..df330f6837cc 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.2 2005/01/05 20:22:36 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.4.0.ebuild,v 1.3 2005/01/07 03:57:24 battousai Exp $
 
 inherit eutils perl-module
 
@@ -78,11 +78,7 @@ src_install() {
 
 	cd ${S}
 
-	# Ditch the _CHANGEME_ for hostname, substituting in our real hostname
-	myhostname="$(< /etc/hostname)"
-	[ -e /etc/dnsdomainname ] && mydomain=".$(< /etc/dnsdomainname)"
-	cp psad.conf psad.conf.orig
-	sed -i "s:HOSTNAME\(.\+\)\_CHANGEME\_;:HOSTNAME\1${myhostname}${mydomain};:" psad.conf || die "Sed failed."
+	fix_psad_conf
 
 	insinto /etc/psad
 	doins *.conf
@@ -116,8 +112,42 @@ pkg_postinst() {
 	einfo "the validity of the HOSTNAME setting and replace the EMAIL_ADDRESSES and"
 	einfo "HOME_NET settings at the least."
 	echo
-	einfo "If you are using a logger other than sysklogd, please be sure to change the"
-	einfo "syslogCmd setting in /etc/psad/psad.conf. An example for syslog-ng users"
-	einfo "would be:"
-	einfo "		syslogCmd = /usr/sbin/syslog-ng;"
+	if has_version ">=app-admin/syslog-ng-0.0.0"
+	then
+		ewarn "You appear to have installed syslog-ng. If you are using syslog-ng as your"
+		ewarn "default system logger, please change the SYSLOG_DAEMON entry in"
+		ewarn "/etc/psad/psad.conf to the following (per examples in psad.conf):"
+		ewarn "		SYSLOG_DAEMON	syslog-ng;"
+		echo
+	fi
+	if has_version ">=app-admin/sysklogd-0.0.0"
+	then
+		einfo "You have sysklogd installed. If this is your default system logger, no"
+		einfo "special configuration is needed. If it is not, please set SYSLOG_DAEMON"
+		einfo "in /etc/psad/psad.conf accordingly."
+		echo
+	fi
+	if has_version ">=app-admin/metalog-0.0"
+	then
+		ewarn "You appear to have installed metalog. If you are using metalog as your"
+		ewarn "default system logger, please change the SYSLOG_DAEMON entry in"
+		ewarn "/etc/psad/psad.conf to the following (per examples in psad.conf):"
+		ewarn "		SYSLOG_DAEMON	metalog"
+	fi
 }
+
+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)"
+	sed -i "s:HOSTNAME\(.\+\)\_CHANGEME\_;:HOSTNAME\1${myhostname}${mydomain};:" psad.conf || die "fix_psad_conf failed"
+
+	# Fix up paths
+	sed -i "s:/sbin/syslogd:/usr/sbin/syslogd:g" psad.conf || die "fix_psad_conf failed"
+	sed -i "s:/sbin/syslog-ng:/usr/sbin/syslog-ng:g" psad.conf || die "fix_psad_conf failed"
+	sed -i "s:/bin/uname:/usr/bin/uname:g" psad.conf || die "fix_psad_conf failed"
+	sed -i "s:/bin/mknod:/usr/bin/mknod:g" psad.conf || die "fix_psad_conf failed"
+}
+