Ubuntu

Merge lp:~racb/ubuntu/precise/modsecurity-apache/988819 into lp:ubuntu/precise/modsecurity-apache

Proposed by Robie Basak on 2012-06-08
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~racb/ubuntu/precise/modsecurity-apache/988819
Merge into: lp:ubuntu/precise/modsecurity-apache
Diff against target: 38 lines (+12/-2) 3 files modified
To merge this branch: bzr merge lp:~racb/ubuntu/precise/modsecurity-apache/988819
Reviewer Review Type Date Requested Status
James Page Approve on 2012-06-08
Ubuntu branches 2012-06-08 Pending
Review via email: mp+109378@code.launchpad.net
To post a comment you must log in.
James Page (james-page) wrote :

Uploaded to -proposed

review: Approve

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2011-12-28 16:51:11 +0000
3+++ debian/changelog 2012-06-08 14:59:23 +0000
4@@ -1,3 +1,12 @@
5+modsecurity-apache (2.6.3-1ubuntu0.1) precise-proposed; urgency=low
6+
7+ * debian/mod-security.load: remove libxml2.so.2 path, since with
8+ multiarch it is always incorrect on i386 and amd64. Use no path and
9+ a corresponding apache2 change to use the standard dlopen search
10+ path in this case to allow the library to be found (LP: #988819).
11+
12+ -- Robie Basak <robie.basak@ubuntu.com> Fri, 08 Jun 2012 15:40:04 +0100
13+
14 modsecurity-apache (2.6.3-1) unstable; urgency=low
15
16 * New upstream release
17
18=== modified file 'debian/control'
19--- debian/control 2011-06-16 13:58:40 +0000
20+++ debian/control 2012-06-08 14:59:23 +0000
21@@ -1,7 +1,8 @@
22 Source: modsecurity-apache
23 Section: httpd
24 Priority: optional
25-Maintainer: Alberto Gonzalez Iniesta <agi@inittab.org>
26+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
27+XSBC-Original-Maintainer: Alberto Gonzalez Iniesta <agi@inittab.org>
28 Build-Depends: debhelper (>> 7.0.0), apache2-threaded-dev|apache2-prefork-dev, libxml2-dev (>= 2.0.50-10), liblua5.1-0-dev, libcurl4-gnutls-dev
29 Standards-Version: 3.9.2
30 Homepage: http://www.modsecurity.org/
31
32=== modified file 'debian/mod-security.load'
33--- debian/mod-security.load 2011-03-23 18:36:29 +0000
34+++ debian/mod-security.load 2012-06-08 14:59:23 +0000
35@@ -1,2 +1,2 @@
36-LoadFile /usr/lib/libxml2.so.2
37+LoadFile libxml2.so.2
38 LoadModule security2_module /usr/lib/apache2/modules/mod_security2.so

Subscribers

People subscribed via source and target branches

to all changes: