Version bump and remove old.

Package-Manager: portage-2.2.0_alpha58/cvs/Linux x86_64

3 files changed, 37 insertions, 44 deletions

diff --git a/www-apache/mod_security/ChangeLog b/www-apache/mod_security/ChangeLog
index 83ae97f229af..4e1d045aff8b 100644
--- a/www-apache/mod_security/ChangeLog
+++ b/www-apache/mod_security/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apache/mod_security
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.57 2011/07/25 10:34:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.58 2011/09/17 08:48:30 flameeyes Exp $
+
+*mod_security-2.6.2_rc1 (17 Sep 2011)
+
+  17 Sep 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  -mod_security-2.5.13-r2.ebuild, +mod_security-2.6.2_rc1.ebuild:
+  Version bump and remove old.
 
 *mod_security-2.6.1 (25 Jul 2011)
 
diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest
index e8523fe6db0b..940d7e6c0e5a 100644
--- a/www-apache/mod_security/Manifest
+++ b/www-apache/mod_security/Manifest
@@ -5,17 +5,17 @@ AUX 2.5.10/99_mod_security.conf 457 RMD160 8f0e24cdfa7a71487365b42fd194a87e5ce42
 AUX mod_security-2.5.10-as-needed.patch 1169 RMD160 56ea5b1de8673556a0cfff3db606824ccb092e92 SHA1 1417de57c5e3bce8bab6f37f6ef532be44140c6c SHA256 aa1086c66d10b40d4ae184dad1bf9fc18e2fc8c6c3474ad2537b1728a01bd8be
 AUX modsecurity.conf 276 RMD160 b8b303a210d05770d307ee60bfcf1400ec83d968 SHA1 35badbac9fe301c18cdda5abacf578e81f36d607 SHA256 00b6f23a10c142828fafeb0362f23846f95ce5d2129a7a3c053dc20554bd078a
 DIST modsecurity-apache_2.5.12.tar.gz 1392209 RMD160 e7dae0754e5866c247083f1291bcd5cd08db87d5 SHA1 eb2068e5d31525fa53769dabd1a1c65896fd4e76 SHA256 168bb6591a0f9665169e0ed223a00d63a1c87e11d1e56388abcf431f30efaa84
-DIST modsecurity-apache_2.5.13.tar.gz 1406635 RMD160 18d598462e7fedc02019f2612002bd0acbcb61fa SHA1 c498277a93de6c8ced2bd204d09c8a91a487fc1f SHA256 0d570fa602c5bbb231f467ace2abb35e4cd0647fd962d4bc21eac1a1efed8b6a
 DIST modsecurity-apache_2.6.1.tar.gz 1161076 RMD160 9740690b772bf9e78dbf84a7eb3bdc0a042872a5 SHA1 dcd88621dfcc9d8607ca33d3c745a2cf671fc606 SHA256 e2e7d939f22ec05c0d17defd462724e181bfe947c5689b76cf88f96e8e423096
+DIST modsecurity-apache_2.6.2-rc1.tar.gz 730491 RMD160 c292a56f3c61d945f48294839d085292e3152452 SHA1 7613981d2bfc9c63f9b3f42cef310be0ea778108 SHA256 bbd79f1da9c356eab5054a8ccf5fd6d34bdef1b3fcfced4ad70b8db26608d5da
 EBUILD mod_security-2.5.12.ebuild 3780 RMD160 93051a495325ef39354c8f7cd0ecfd202a537db9 SHA1 8d638448793d19bd1e74b1017cdda5632a48664b SHA256 2eb168002097badb690bf895e1770171c98b0f3aaf60828e435c960ce4737fd7
-EBUILD mod_security-2.5.13-r2.ebuild 2858 RMD160 ba2e1eef13ffaba6d35d3aa25b117807129ae5bd SHA1 96626711783fd6151016dcc7989ffe188c2a94ab SHA256 213750542f3c51eb89889514e0803b9fa6507a3dc5de20a5ff65ac498e2f5986
 EBUILD mod_security-2.6.1.ebuild 2477 RMD160 2ebb853ae71d6f2cae9f6615fa7189e94c69f8f2 SHA1 fe17753be4ae007cdcf70d2b5c484d2172212aec SHA256 04e365006aee6751a5dc0bd42cdfce31ab0d95994d44ef2c6ae926227196a5fa
-MISC ChangeLog 15165 RMD160 fa789a12048d986bb6d30ef2d3c5819afa5b845a SHA1 208cf1e9dbeeac3533c92e1af3cd31711cea73e7 SHA256 d2e97550181bd1b21cec32480af611a14d2b383de47e00367b700237ed882066
+EBUILD mod_security-2.6.2_rc1.ebuild 2481 RMD160 9719ea9909f1739b6a5f031b1d6a5d918fad4ce8 SHA1 c71feed6a1d45b9dc7cc62369e26bf405210522b SHA256 ad435b9b83869057ec28ecc64f7c46e1e0c83cd5209665f3fbe945050df6330f
+MISC ChangeLog 15358 RMD160 d7aeaabab0e22e955ca1a44dff69d0ef7eaa672f SHA1 43941470c67bddb385bbad04a55b5d73717296ed SHA256 ac02bf1fce1d85888eb1a0068bd1322a6c039d0f67f74e21ed2a2cd7482def19
 MISC metadata.xml 1314 RMD160 a5ef1462d8c1f9c3526d7eebd328f5aec6ac5396 SHA1 6047ee181f17636836d44bb8f907a3a4cd5448c7 SHA256 d9e91ba25184276208c7c8e5c6e513d0204c77c247d56c9627bd38f117539e0c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4tRqkACgkQAiZjviIA2XipagCfbRRr2EFIxWqgzcqUeaxmZ5Yt
-4s4AoMf16GucaRAteiJRfBno8DqhAvOd
-=ytIl
+iEYEARECAAYFAk50XsoACgkQAiZjviIA2XicWgCgw7N1D5s2Qy1ALSO98z8j6CFm
+EeEAn33pvDcHZpMDBh4VQ1uKSmA6OYjF
+=v6e0
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_security/mod_security-2.5.13-r2.ebuild b/www-apache/mod_security/mod_security-2.6.2_rc1.ebuild
index 8608e48053ec..c8f9b4f8fa93 100644
--- a/www-apache/mod_security/mod_security-2.5.13-r2.ebuild
+++ b/www-apache/mod_security/mod_security-2.6.2_rc1.ebuild
@@ -1,24 +1,28 @@
 # Copyright 1999-2011 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.13-r2.ebuild,v 1.2 2011/03/28 21:58:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/mod_security-2.6.2_rc1.ebuild,v 1.1 2011/09/17 08:48:30 flameeyes Exp $
 
-EAPI=3
+EAPI=4
 
 inherit apache-module autotools
 
-MY_P=modsecurity-apache_${PV/_rc/-rc}
+MY_PN=modsecurity-apache
+MY_PV=${PV/_rc/-rc}
+MY_P=${MY_PN}_${MY_PV}
 
 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"
+SRC_URI="mirror://sourceforge/project/mod-security/${MY_PN}/${MY_PV}/${MY_P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="lua geoip"
+IUSE="geoip curl lua"
 
-DEPEND="dev-libs/libxml2
+DEPEND=">=dev-libs/libxml2-2.7.8
+	dev-libs/libpcre
 	lua? ( >=dev-lang/lua-5.1 )
+	curl? ( >=net-misc/curl-7.15.1 )
 	www-servers/apache[apache2_modules_unique_id]"
 RDEPEND="${DEPEND}
 	geoip? ( dev-libs/geoip )"
@@ -29,22 +33,22 @@ S="${WORKDIR}/${MY_P}"
 APACHE2_MOD_FILE="apache2/.libs/${PN}2.so"
 APACHE2_MOD_DEFINE="SECURITY"
 
+# Tests require symbols only defined within the Apache binary.
+RESTRICT=test
+
 need_apache2
 
 src_prepare() {
 	cp "${FILESDIR}"/modsecurity.conf "${T}"/79_modsecurity.conf || die
 
-	epatch "${FILESDIR}"/${PN}-2.5.10-as-needed.patch
-
-	cd apache2
 	eautoreconf
 }
 
 src_configure() {
-	cd apache2
-
-	econf --with-apxs="${APXS}" \
-		--without-curl \
+	econf \
+		--enable-shared --disable-static \
+		--with-apxs="${APXS}" \
+		$(use_enable curl mlogc) \
 		$(use_with lua) \
 		|| die "econf failed"
 }
@@ -55,25 +59,11 @@ src_compile() {
 			"${T}"/79_modsecurity.conf || die
 	fi
 
-	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 -C apache2 \
-		APXS_CFLAGS="${CFLAGS}" \
-		APXS_LDFLAGS="${LDFLAGS}" \
-		APXS_EXTRA_CFLAGS="${APXS_FLAGS}" \
-		|| die "emake failed"
+	emake || die
 }
 
 src_test() {
-	emake -C apache2 test || die
+	emake check || die
 }
 
 src_install() {
@@ -84,14 +74,11 @@ src_install() {
 	insinto "${APACHE_MODULES_CONFDIR}"
 	doins "${T}"/79_modsecurity.conf
 
-	# install documentation; don't install index.html as it references
-	# the PDF and split-pages versions of the same documentation.
 	dodoc CHANGES
-	dohtml "${S}"/doc/*.{css,gif,jpg} "${S}"/doc/modsecurity2*.html
 
-	keepdir /var/cache/modsecurity || die
-	fowners apache:apache /var/cache/modsecurity || die
-	fperms 0770 /var/cache/modsecurity || die
+	keepdir /var/cache/modsecurity
+	fowners apache:apache /var/cache/modsecurity
+	fperms 0770 /var/cache/modsecurity
 }
 
 pkg_postinst() {