summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEldad Zack <eldad@gentoo.org>2004-11-04 12:33:13 +0000
committerEldad Zack <eldad@gentoo.org>2004-11-04 12:33:13 +0000
commit81552541a95a683ed348e10aa5160c826e5fe171 (patch)
tree0d688c0fff376f7b5a336eef22a355f4c1b48db5 /net-analyzer/acid
parentLatest = stable (Manifest recommit) (diff)
downloadgentoo-2-81552541a95a683ed348e10aa5160c826e5fe171.tar.gz
gentoo-2-81552541a95a683ed348e10aa5160c826e5fe171.tar.bz2
gentoo-2-81552541a95a683ed348e10aa5160c826e5fe171.zip
PHP 5 Compatability fixes. Closes #60489.
Diffstat (limited to 'net-analyzer/acid')
-rw-r--r--net-analyzer/acid/ChangeLog6
-rw-r--r--net-analyzer/acid/acid-0.9.6_beta23.ebuild13
2 files changed, 15 insertions, 4 deletions
diff --git a/net-analyzer/acid/ChangeLog b/net-analyzer/acid/ChangeLog
index e6d5fa26e75e..9cdebe9e37c4 100644
--- a/net-analyzer/acid/ChangeLog
+++ b/net-analyzer/acid/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-analyzer/acid
# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/acid/ChangeLog,v 1.6 2004/10/25 17:48:46 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/acid/ChangeLog,v 1.7 2004/11/04 12:33:13 eldad Exp $
+
+ 04 Nov 2004; Eldad Zack <eldad@gentoo.org> acid-0.9.6_beta23.ebuild:
+ PHP 5 Compatability fixes. Thanks to Christian Malerbakken
+ <christian@malerbakken.com>. Closes #60489.
25 Oct 2004; Michael Hanselmann <hansmi@gentoo.org>
acid-0.9.6_beta23.ebuild:
diff --git a/net-analyzer/acid/acid-0.9.6_beta23.ebuild b/net-analyzer/acid/acid-0.9.6_beta23.ebuild
index f314ea59225a..b5eab1cbeb9e 100644
--- a/net-analyzer/acid/acid-0.9.6_beta23.ebuild
+++ b/net-analyzer/acid/acid-0.9.6_beta23.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/acid/acid-0.9.6_beta23.ebuild,v 1.7 2004/10/25 17:48:46 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/acid/acid-0.9.6_beta23.ebuild,v 1.8 2004/11/04 12:33:13 eldad Exp $
-inherit webapp
+inherit webapp versionator eutils
MY_P=${P/_beta/b}
DESCRIPTION="Snort ACID - Analysis Console for Intrusion Databases"
@@ -35,13 +35,19 @@ check_useflag() {
eerror "${my_pkg} was compiled without ${my_flag}. Please re-emerge it with USE=${my_flag}"
die "check_useflag failed"
-
}
pkg_setup() {
webapp_pkg_setup
check_useflag dev-php/mod_php gd
+
+ # If mod_php used is >= 5.0.0, it has to have session useflag enabled.
+ local ver_modphp=$(best_version mod_php)
+ ver_modphp=${ver_modphp/dev-php\/mod_php-/}
+ if [[ $(get_major_version ${ver_modphp}) -ge 5 ]]; then
+ check_useflag dev-php/mod_php session
+ fi
}
src_compile () {
@@ -52,6 +58,7 @@ src_install () {
webapp_src_preinst
sed -i -e '12s:^$DBlib_path =.*:$DBlib_path = "/usr/lib/php/adodb";:' acid_conf.php
+ sed -i -e '67s/($version\[0\] >= 4)/($version[0] >= 5) || &/' acid_db_common.php
insinto ${MY_HTDOCSDIR}
doins *