Gentoo Archives: gentoo-commits

From: "Diego Petteno (flameeyes)" <flameeyes@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-apache/mod_security: mod_security-2.7.5.ebuild ChangeLog mod_security-2.7.3.ebuild
Date: Thu, 01 Aug 2013 10:03:01
Message-Id: 20130801100227.592712171C@flycatcher.gentoo.org
1 flameeyes 13/08/01 10:02:27
2
3 Modified: ChangeLog
4 Added: mod_security-2.7.5.ebuild
5 Removed: mod_security-2.7.3.ebuild
6 Log:
7 Version bump; remove old.
8
9 (Portage version: 2.2.0_alpha189/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)
10
11 Revision Changes Path
12 1.113 www-apache/mod_security/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_security/ChangeLog?rev=1.113&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_security/ChangeLog?rev=1.113&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_security/ChangeLog?r1=1.112&r2=1.113
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v
21 retrieving revision 1.112
22 retrieving revision 1.113
23 diff -u -r1.112 -r1.113
24 --- ChangeLog 9 Jun 2013 12:13:11 -0000 1.112
25 +++ ChangeLog 1 Aug 2013 10:02:26 -0000 1.113
26 @@ -1,6 +1,12 @@
27 # ChangeLog for www-apache/mod_security
28 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.112 2013/06/09 12:13:11 ago Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.113 2013/08/01 10:02:26 flameeyes Exp $
31 +
32 +*mod_security-2.7.5 (01 Aug 2013)
33 +
34 + 01 Aug 2013; Diego E. Pettenò <flameeyes@g.o>
35 + +mod_security-2.7.5.ebuild, -mod_security-2.7.3.ebuild:
36 + Version bump; remove old.
37
38 09 Jun 2013; Agostino Sarubbo <ago@g.o> mod_security-2.7.4.ebuild:
39 Stable for ppc, wrt bug #471690
40
41
42
43 1.1 www-apache/mod_security/mod_security-2.7.5.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_security/mod_security-2.7.5.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_security/mod_security-2.7.5.ebuild?rev=1.1&content-type=text/plain
47
48 Index: mod_security-2.7.5.ebuild
49 ===================================================================
50 # Copyright 1999-2013 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/mod_security-2.7.5.ebuild,v 1.1 2013/08/01 10:02:26 flameeyes Exp $
53
54 EAPI=4
55
56 inherit apache-module
57
58 MY_PN=modsecurity-apache
59 MY_PV=${PV/_rc/-rc}
60 MY_P=${MY_PN}_${MY_PV}
61
62 DESCRIPTION="Web application firewall and Intrusion Detection System for Apache."
63 HOMEPAGE="http://www.modsecurity.org/"
64 SRC_URI="http://www.modsecurity.org/tarball/${PV}/${MY_P}.tar.gz"
65
66 LICENSE="Apache-2.0"
67 SLOT="0"
68 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
69 IUSE="geoip curl lua jit"
70
71 DEPEND=">=dev-libs/libxml2-2.7.8
72 dev-libs/libpcre[jit?]
73 lua? ( >=dev-lang/lua-5.1 )
74 curl? ( >=net-misc/curl-7.15.1 )
75 www-servers/apache[apache2_modules_unique_id]"
76 RDEPEND="${DEPEND}
77 geoip? ( dev-libs/geoip )"
78 PDEPEND=">=www-apache/modsecurity-crs-2.2.6-r1"
79
80 S="${WORKDIR}/${MY_P}"
81
82 APACHE2_MOD_FILE="apache2/.libs/${PN}2.so"
83 APACHE2_MOD_DEFINE="SECURITY"
84
85 # Tests require symbols only defined within the Apache binary.
86 RESTRICT=test
87
88 need_apache2
89
90 src_prepare() {
91 cp "${FILESDIR}"/modsecurity-2.7.conf "${T}"/79_modsecurity.conf || die
92 }
93
94 src_configure() {
95 econf \
96 --enable-shared --disable-static \
97 --with-apxs="${APXS}" \
98 --enable-request-early \
99 $(use_enable curl mlogc) \
100 $(use_with lua) \
101 $(use_enable jit pcre-jit)
102 }
103
104 src_compile() {
105 if ! use geoip; then
106 sed -i -e '/SecGeoLookupDb/s:^:#:' \
107 "${T}"/79_modsecurity.conf || die
108 fi
109
110 emake
111 }
112
113 src_test() {
114 emake check
115 }
116
117 src_install() {
118 apache-module_src_install
119
120 # install manually rather than by using the APACHE2_MOD_CONF
121 # variable since we have to edit it to set things up properly.
122 insinto "${APACHE_MODULES_CONFDIR}"
123 doins "${T}"/79_modsecurity.conf
124
125 dodoc CHANGES NOTICE README.TXT README_WINDOWS.TXT
126
127 dohtml -r doc/*
128
129 keepdir /var/cache/modsecurity
130 fowners apache:apache /var/cache/modsecurity
131 fperms 0770 /var/cache/modsecurity
132 }
133
134 pkg_postinst() {
135 if [[ -f "${ROOT}"/etc/apache/modules.d/99_mod_security.conf ]]; then
136 ewarn "You still have the configuration file 99_mod_security.conf."
137 ewarn "Please make sure to remove that and keep only 79_modsecurity.conf."
138 ewarn ""
139 fi
140 elog "The base configuration file has been renamed 79_modsecurity.conf"
141 elog "so that you can put your own configuration as 90_modsecurity_local.conf or"
142 elog "equivalent."
143 elog ""
144 elog "That would be the correct place for site-global security rules."
145 elog "Note: 80_modsecurity_crs.conf is used by www-apache/modsecurity-crs"
146 }