Ubuntu

Merge lp:~kroq-gar78/ubuntu/precise/mod-proxy-html/fix-1005425 into lp:ubuntu/precise/mod-proxy-html

Proposed by kroq-gar78 on 2012-06-12
Status: Work in progress
Proposed branch: lp:~kroq-gar78/ubuntu/precise/mod-proxy-html/fix-1005425
Merge into: lp:ubuntu/precise/mod-proxy-html
Diff against target: 40 lines (+16/-5) 2 files modified
To merge this branch: bzr merge lp:~kroq-gar78/ubuntu/precise/mod-proxy-html/fix-1005425
Reviewer Review Type Date Requested Status
James Page Needs Fixing on 2012-06-15
Andrew Starr-Bochicchio (community) Needs Fixing on 2012-06-13
Ubuntu branches 2012-06-12 Pending
Review via email: mp+109766@code.launchpad.net

Description of the Change

I fixed the path of libxml.so.2 by using the debian/postinst script.

To post a comment you must log in.

As in the other merge request: I'm not sure we need to be using sed for this. Could you look at version 3.0.1-1.1 from Debian which is now in quantal?

It seems to fix this with:

diff -u mod-proxy-html-3.0.1/debian/conf/proxy_html.load mod-proxy-html-3.0.1/debian/conf/proxy_html.load
--- mod-proxy-html-3.0.1/debian/conf/proxy_html.load
+++ mod-proxy-html-3.0.1/debian/conf/proxy_html.load
@@ -1,2 +1,2 @@
-LoadFile /usr/lib/libxml2.so.2
+LoadFile libxml2.so.2
 LoadModule proxy_html_module /usr/lib/apache2/modules/mod_proxy_html.so

review: Needs Fixing
James Page (james-page) wrote :

Andrew is correct but please see bug 988819 - this includes an apache2 change to make apache use dlopen as a fallback so that the .so file can be specificied without a full path.

Its currently in -proposed awaiting verification.

review: Needs Fixing

Unmerged revisions

8. By kroq-gar78 on 2012-05-31

debian/postinst: use 'uname' instead of 'dpkg-architecture' for path configuration

7. By kroq-gar78 on 2012-05-29

debian/postinst: replace the path for libxml2.so.2 in field
'LoadFile' in file 'debian/conf/proxy_html.load' with the multiarch-
friendly path using sed (LP: #1005425)

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2008-08-20 12:06:58 +0000
3+++ debian/changelog 2012-06-12 02:49:19 +0000
4@@ -1,3 +1,11 @@
5+mod-proxy-html (3.0.1-1ubuntu1) precise; urgency=low
6+
7+ * debian/postinst: replace the path for libxml2.so.2 in field
8+ 'LoadFile' in file 'debian/conf/proxy_html.load' with the multiarch-
9+ friendly path using sed (LP: #1005425)
10+
11+ -- Aditya Vaidya <kroq.gar78@gmail.com> Mon, 28 May 2012 22:28:41 -0500
12+
13 mod-proxy-html (3.0.1-1) unstable; urgency=low
14
15 * New upstream release
16
17=== modified file 'debian/postinst'
18--- debian/postinst 2007-10-16 11:38:11 +0000
19+++ debian/postinst 2012-06-12 02:49:19 +0000
20@@ -40,12 +40,15 @@
21 reload_apache
22 fi
23 else
24- # Enable the module
25- if [ -e /etc/apache2/apache2.conf ]; then
26- a2enmod proxy_html >/dev/null || true
27- reload_apache
28+ # Enable the module
29+ if [ -e /etc/apache2/apache2.conf ]; then
30+ a2enmod proxy_html >/dev/null || true
31+ reload_apache
32+ fi
33 fi
34- fi
35+
36+ # Use multiarch-friendly paths for libxml.so.2 in proxy_html.load
37+ sed -i "s/\/usr\/lib\/libxml2.so.2/\/usr\/lib\/`uname -i`-linux-gnu\/libxml2.so.2/g" /etc/apache2/mods-available/proxy_html.load
38 ;;
39
40 abort-upgrade|abort-remove|abort-deconfigure)

Subscribers

People subscribed via source and target branches

to all changes: