Update to version 2.5.9; finally respect flags (if apxs allows to..), have a test function, simplify install.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 150 insertions, 3 deletions

diff --git a/www-apache/mod_security/ChangeLog b/www-apache/mod_security/ChangeLog
index 0852c39e6dc4..797d01bee3ba 100644
--- a/www-apache/mod_security/ChangeLog
+++ b/www-apache/mod_security/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apache/mod_security
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.17 2009/01/01 14:20:13 hollow Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.18 2009/05/22 19:04:25 flameeyes Exp $
+
+*mod_security-2.5.9 (22 May 2009)
+
+  22 May 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  +mod_security-2.5.9.ebuild,
+  +files/mod_security-2.5.9-broken-autotools.patch:
+  Update to version 2.5.9; finally respect flags (if apxs allows to..), have
+  a test function, simplify install.
 
 *mod_security-2.5.7 (01 Jan 2009)
 
diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest
index 0178eda75e03..baf4b42adb4b 100644
--- a/www-apache/mod_security/Manifest
+++ b/www-apache/mod_security/Manifest
@@ -1,13 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.1.2/99_mod_security.conf 198 RMD160 cde9de9e21d3e31467737a87fe6af73e18827bc6 SHA1 f41792ed3de6955786d5b08da708c74e2be6d3bf SHA256 45ae219fca3eddadf47b9ebd1ebd44c668833b894a38672c481a828af97cdfcf
+AUX mod_security-2.5.9-broken-autotools.patch 1477 RMD160 8e9f43df30c56efa700bd6b52643d61b0c05eadf SHA1 b5863384a9bfbdf9360ede60277ec8516e853df2 SHA256 5d928a541828aaa69d01fffd0956c6f945c9b5858ad2eed2999955ab9ad827e4
 DIST modsecurity-apache_2.1.2.tar.gz 657803 RMD160 3d0d2a767133ab1ec1ef3848e2f85c3c1652cf1f SHA1 ee0f851308c0b0b87b620c83b3532d495528fa8d SHA256 88644e0a512534e394d434df3f0f233889d9e6a5a91ed2e893b5bb9a4d190c8a
 DIST modsecurity-apache_2.1.6.tar.gz 679366 RMD160 3133e67f415ba3273563e6f4e0a43c7ecc7812ae SHA1 08c2d18d555159fa7cab626c410f92a7bbfa57b3 SHA256 144e2c82a5b0f356e11148184d97634302c6c4281aef68d2700b970b84536273
 DIST modsecurity-apache_2.5.5.tar.gz 1073723 RMD160 04b116c6a1d0d4af38ec100bb62302294bb7106c SHA1 41a08b9af902b67eabaabe2dd3c257d35aaf5d30 SHA256 626909c8408e2fd9e387f592f49e9d2c6501513b4cdc18dd89a8e9f3e124d959
 DIST modsecurity-apache_2.5.6.tar.gz 1079094 RMD160 a051211538334aa9a753e92ab787ff49ffd0b685 SHA1 5fb2b5ff3933d4bf766f2e46242bb991603e7081 SHA256 9f38176cdb69e610238e5aa5401b0fc72972fc72af5d9203ada98f962833bdca
 DIST modsecurity-apache_2.5.7.tar.gz 1117167 RMD160 063f68123bc8b70a4abc457c3794d751ab1ebede SHA1 29a4f8f376dbc1ab3b05c943a1a3c1e4a9e8196a SHA256 581b81e39fe23bae75f460547b8d4c172ffaa54ff913ccf94b62cc56b4fb3d9a
+DIST modsecurity-apache_2.5.9.tar.gz 1252295 RMD160 adab10e5eab50f0d114e3ccb47c343e744119c8f SHA1 875919332a918956371fe8e2f7e46d88081857cf SHA256 02352221ea268f8ae9aae5b84507f51eba2a67c0f7d2efd5cc88e85f1f394056
 EBUILD mod_security-2.1.2.ebuild 1400 RMD160 1182531b3194a46b014a140212d2190a2957fe96 SHA1 023b1817c4e1181a77f8b9a9b2135dae39d29e31 SHA256 5edc46ed1e7fc8a4d2f232e2c7f45de54ba10e9c5b43b2274d64764a46b23037
 EBUILD mod_security-2.1.6.ebuild 1424 RMD160 687f4e0692cb8443411d5df23ab9d301215c9a37 SHA1 961cf48f6330f014c57a476838388ac386273377 SHA256 6578d751df77c29dc41e4cf1d8b80b86434efc32393327eaaa184c05d68cba3b
 EBUILD mod_security-2.5.5.ebuild 1577 RMD160 2b281cbafc657bd9ea51f67ff52f6b2c4fa5b2af SHA1 d5435cee8c95bc7f0193d9e2f31a32bdcdee2c3e SHA256 f2421ccda41f7e0576054eccfa07c77b01324c7aca6f4647bf38674b23a24031
 EBUILD mod_security-2.5.6.ebuild 1577 RMD160 af8265649bd7c8fed94019abd36ef3964237baed SHA1 f16baa6eefc63b6a56c34e526d3a3ffe36ed4af9 SHA256 1bf795f7bde942f683c0377e876b31eda4df7218fe3e88b1789c644c14a220b2
 EBUILD mod_security-2.5.7.ebuild 1577 RMD160 ffebbe02c06231094c07638a9a5be832f355dc1e SHA1 b009ba5eba3475e9cb4535b6ae9a81d53d14abfc SHA256 6fe50278e9dbfad376ebd051c7a52cad7c0fba23cfa5a780b4ae5f8c214edc15
-MISC ChangeLog 6545 RMD160 7dcf79db3fc978598eaf5ceeeff76a0c30bc3377 SHA1 21b3e948f974fcf1949a94721871cf0c61a22685 SHA256 55431a71aabb9326efb7efef015c5284876f26e5762957518a81e4d53042809c
+EBUILD mod_security-2.5.9.ebuild 1950 RMD160 d0e0c56aceabf2c2eceb246f2f774172f918dbce SHA1 39065bc2f42ba48ae71a478cb4ae0da72cc15eb2 SHA256 91b87371ea66a8d26977c956e9b2d69e49230ce120f2ad7351be117c77d7bcae
+MISC ChangeLog 6836 RMD160 1a073f8a00df04fe089c4e96788b9d297e1a3eea SHA1 1663655ce25261bfb143eeb9586c672b0a3871d8 SHA256 7b9197a888ac3650c2fd89a0cb86129f15992cc72d0649c295d5e823c5fa611f
 MISC metadata.xml 255 RMD160 a80959a97f317179745aa51dc813fc77fc12f431 SHA1 202b14b369f47c3f1f5b44384447c7769cc61755 SHA256 deef3dd2faff775a34529a8909b6e003cce31ee1a9858ace880da761f463ab65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoW9z8ACgkQAiZjviIA2XjWeQCgzypp9Lvy5JJ1L2rwmelIo/2K
+Ky4AoIw1CfGvS28hx6v0tl/Qdixx7bxO
+=SRgP
+-----END PGP SIGNATURE-----
diff --git a/www-apache/mod_security/files/mod_security-2.5.9-broken-autotools.patch b/www-apache/mod_security/files/mod_security-2.5.9-broken-autotools.patch
new file mode 100644
index 000000000000..75cbb4600f60
--- /dev/null
+++ b/www-apache/mod_security/files/mod_security-2.5.9-broken-autotools.patch
@@ -0,0 +1,34 @@
+Index: modsecurity-apache_2.5.9/apache2/build/find_apr.m4
+===================================================================
+--- modsecurity-apache_2.5.9.orig/apache2/build/find_apr.m4
++++ modsecurity-apache_2.5.9/apache2/build/find_apr.m4
+@@ -24,9 +24,9 @@ AC_ARG_WITH(
+ AC_MSG_CHECKING([for libapr config script])
+ 
+ dnl # Determine if the script was specified and use it directly
+-if test ! -d "${withval}" -a -e "${withval}"; then
+-    APR_CONFIG="`basename $withval`"
+-    with_apr=`echo ${withval} | sed "s/\/\?${APR_CONFIG}\$//"`
++if test ! -d "${apr_path}" -a -e "${apr_path}"; then
++    APR_CONFIG="`basename $apr_path`"
++    with_apr=`echo ${apr_path} | sed "s/\/\?${APR_CONFIG}\$//"`
+ fi
+ 
+ dnl # Look for the config script
+Index: modsecurity-apache_2.5.9/apache2/build/find_apu.m4
+===================================================================
+--- modsecurity-apache_2.5.9.orig/apache2/build/find_apu.m4
++++ modsecurity-apache_2.5.9/apache2/build/find_apu.m4
+@@ -24,9 +24,9 @@ AC_ARG_WITH(
+ AC_MSG_CHECKING([for libapr-util config script])
+ 
+ dnl # Determine if the script was specified and use it directly
+-if test ! -d "${withval}" -a -e "${withval}"; then
+-    APU_CONFIG="`basename $withval`"
+-    with_apu=`echo ${withval} | sed "s/\/\?${APU_CONFIG}\$//"`
++if test ! -d "${apu_path}" -a -e "${apu_path}"; then
++    APU_CONFIG="`basename $apu_path`"
++    with_apu=`echo ${apu_path} | sed "s/\/\?${APU_CONFIG}\$//"`
+ fi
+ 
+ dnl # Look for the config script
diff --git a/www-apache/mod_security/mod_security-2.5.9.ebuild b/www-apache/mod_security/mod_security-2.5.9.ebuild
new file mode 100644
index 000000000000..c8d8b411e663
--- /dev/null
+++ b/www-apache/mod_security/mod_security-2.5.9.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/mod_security-2.5.9.ebuild,v 1.1 2009/05/22 19:04:25 flameeyes Exp $
+
+inherit apache-module autotools
+
+MY_P=${P/mod_security-/modsecurity-apache_}
+MY_P=${MY_P/_rc/-rc}
+
+DESCRIPTION="Web application firewall and Intrusion Detection System for Apache."
+HOMEPAGE="http://www.modsecurity.org/"
+SRC_URI="http://www.modsecurity.org/download/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
+IUSE="lua"
+
+DEPEND="dev-libs/libxml2
+	lua? ( >=dev-lang/lua-5.1 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+APACHE2_MOD_FILE="apache2/.libs/${PN}2.so"
+APACHE2_MOD_CONF="2.1.2/99_mod_security"
+APACHE2_MOD_DEFINE="SECURITY"
+
+need_apache2
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"/apache2
+
+	epatch "${FILESDIR}"/${P}-broken-autotools.patch
+
+	eautoreconf
+}
+
+src_compile() {
+	cd apache2
+
+	econf --with-apxs="${APXS}" \
+		--without-curl \
+		$(use_with lua) \
+		|| die "econf failed"
+
+	APXS_FLAGS=
+	for flag in ${CFLAGS}; do
+		APXS_FLAGS="${APXS_FLAGS} -Wc,${flag}"
+	done
+
+	# Yes we need to prefix it _twice_
+	for flag in ${LDFLAGS}; do
+		APXS_FLAGS="${APXS_FLAGS} -Wl,${flag}"
+	done
+
+	emake \
+		APXS_CFLAGS="${CFLAGS}" \
+		APXS_LDFLAGS="${LDFLAGS}" \
+		APXS_EXTRA_CFLAGS="${APXS_FLAGS}" \
+		|| die "emake failed"
+}
+
+src_test() {
+	cd apache2
+	make test || die
+}
+
+src_install() {
+	apache-module_src_install
+
+	# install rules updater
+	newbin tools/rules-updater.pl modsec-rules-updater || die
+
+	# install documentation
+	dodoc CHANGES || die
+	newdoc rules/CHANGELOG CHANGES.crs || die
+	newdoc rules/README README.crs || die
+	dohtml -r doc/* || die
+
+	# Prepare the core ruleset
+	cd "${S}"/rules/
+
+	sed -i -e 's:logs/:/var/log/apache2/:g' *.conf || die
+
+	insinto ${APACHE_MODULES_CONFDIR}/mod_security/
+	for i in *.conf; do
+		newins ${i} ${i/modsecurity_crs_/} || die
+	done
+}