diff options
| author |   Eldad Zack <eldad@gentoo.org> | 2004-11-04 12:33:13 +0000 |
|---|---|---|
| committer | Eldad Zack <eldad@gentoo.org> | 2004-11-04 12:33:13 +0000 |
| commit | 9106c651bc926eb04507c683613e9657c06315f5 (patch) | |
| tree | 6678798baa26e746810ffb1f6c0c98f66ed9d096 /net-analyzer/acid | |
| parent | Latest = stable (diff) | |
| download | historical-9106c651bc926eb04507c683613e9657c06315f5.tar.gz historical-9106c651bc926eb04507c683613e9657c06315f5.tar.bz2 historical-9106c651bc926eb04507c683613e9657c06315f5.zip | |
PHP 5 Compatability fixes. Closes #60489.
Diffstat (limited to 'net-analyzer/acid')
| -rw-r--r-- | net-analyzer/acid/ChangeLog | 6 | ||||
| -rw-r--r-- | net-analyzer/acid/Manifest | 14 | ||||
| -rw-r--r-- | net-analyzer/acid/acid-0.9.6_beta23.ebuild | 13 |
3 files changed, 27 insertions, 6 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/Manifest b/net-analyzer/acid/Manifest index 4538db691803..25b376d0feb8 100644 --- a/net-analyzer/acid/Manifest +++ b/net-analyzer/acid/Manifest @@ -1,4 +1,14 @@ -MD5 c96f0bc350938f601155807811235435 acid-0.9.6_beta23.ebuild 1524 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 232980e34db9e7d2f69b8c5d641a74a6 acid-0.9.6_beta23.ebuild 1884 +MD5 ef65b7db5576ee68cda895e6f20c99dc ChangeLog 1409 MD5 d5e9bd932b7a02f7fbaa05865d864854 metadata.xml 248 -MD5 3d11c459467596968e3c2792cc691949 ChangeLog 1231 MD5 26f34d01017d5c8acb2d58fd139cef67 files/digest-acid-0.9.6_beta23 65 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.2.6 (GNU/Linux) + +iD8DBQFBiiDtT+MN7JbqCpMRAj5WAJ4/gdSGTbcoLGQE59I+tcDuJcO10gCfUmzZ +OBqk9j97D+1H9UYKEMVSYrI= +=q8fz +-----END PGP SIGNATURE----- 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 * |