Bug#503616: RFC: how to push the fix for #503616 (and on the fix itself)
tags 503616 + patch
thanks
Dear -release-rs,
how should I push the fix for #503616? Via t-p-u or unstable + unblock
request?
Long story: only recently it has been brought to my attention #503616
which affects an Apache module currently in testing.
I do have a fix already, but it involves using an -rpath. Still, I do
believe it is possible one of the few proper usages of -rpath, my
reasoning is in the bug log, and is agreed upon by other Debian OCaml
members.
Also, this solution permits to fix only ocamlnet in Lenny, while the
other (rpath-free) solution I envisaged would require fixing both
ocamlnet and ocaml in the Lenny timeframe. (... and we do not think it
is the right solution.)
Now, my question is how should I push the fix: via t-p-u or via
unstable + unblock request? The diff to the latest ocamlnet version in
Lenny is attached for review.
Cheers.
--
Stefano Zacchiroli -*- PhD in Computer Science \ PostDoc @ Univ. Paris 7
zack@{upsilon.cc,pps.jussieu.fr,debian.org} -<>- http://upsilon.cc/zack/
Dietro un grande uomo c'è sempre /oo\ All one has to do is hit the right
uno zaino -- A.Bergonzoni \__/ keys at the right time -- J.S.Bach
diff --git a/debian/changelog b/debian/changelog
index 0cbcf4d..d969761 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ocamlnet (2.2.9-3+lenny1) testing-proposed-updates; urgency=low
+
+ * add rpath pointing at `ocamlc -where` to the Apache module shipped by
+ libapache2-mod-ocamlnet, so that libcamlrun_shared.so can be found
+ (Closes: #503616)
+ * fix wrong path in /etc/apache2/mods-available/netcgi_apache.load, which
+ inhibited proper loading of netcgi .cma library
+ (also needed to fix #503616)
+
+ -- Stefano Zacchiroli <zack@debian.org> Wed, 29 Oct 2008 00:09:07 +0100
+
ocamlnet (2.2.9-3) unstable; urgency=medium
[ Stephane Glondu ]
diff --git a/debian/etc/netcgi_apache.load b/debian/etc/netcgi_apache.load
index a4b51fb..a105813 100644
--- a/debian/etc/netcgi_apache.load
+++ b/debian/etc/netcgi_apache.load
@@ -4,4 +4,4 @@ NetcgiLoad netsys/netsys.cma
NetcgiLoad netstring/netstring.cma
NetcgiLoad str.cma
NetcgiLoad netcgi2/netcgi.cma
-NetcgiLoad netcgi2-apache/netcgi_apache.cma
+NetcgiLoad netcgi_apache/netcgi_apache.cma
diff --git a/debian/patches/00list b/debian/patches/00list
index b899fa0..09ac5b0 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,5 +1,6 @@
camlp5_5_alias_pat.dpatch
camlrun_shared.dpatch
+rpath-apache.dpatch
dont_install_gpl.dpatch
mkdir_destdir.dpatch
missing_shebangs.dpatch
diff --git a/debian/patches/rpath-apache.dpatch b/debian/patches/rpath-apache.dpatch
new file mode 100755
index 0000000..ebe6a0a
--- /dev/null
+++ b/debian/patches/rpath-apache.dpatch
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## rpath-apache.dpatch by Stefano Zacchiroli <zack@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: add rpath to Apache module, pointing to `ocamlc -where`
+## DP: rationale: ensure libcamlrun_shared.so can be found
+
+@DPATCH@
+diff -urNad ocamlnet~/src/netcgi2-apache/Makefile.def ocamlnet/src/netcgi2-apache/Makefile.def
+--- ocamlnet~/src/netcgi2-apache/Makefile.def 2008-10-29 00:19:10.175784001 +0100
++++ ocamlnet/src/netcgi2-apache/Makefile.def 2008-10-29 00:19:56.095780612 +0100
+@@ -46,7 +46,7 @@
+ ### Embed Caml code into the C code.
+ ### Requires `caml_startup' instead of `caml_main' in handler.c
+ mod_netcgi_apache.so: $(MOD_OBJECTS)
+- $(APXS) -c -o $@ $^ -L$(APACHE_OCAMLLIBDIR) $(patsubst -lcamlrun,-lcamlrun_shared,$(APACHE_OCAMLLIBS))
++ $(APXS) -c -o $@ $^ -L$(APACHE_OCAMLLIBDIR) -Wl,--rpath,$(APACHE_OCAMLLIBDIR) $(patsubst -lcamlrun,-lcamlrun_shared,$(APACHE_OCAMLLIBS))
+ test -f .libs/$@ && cp .libs/$@ .
+
+ netcgi_apache_mod.lo: netcgi_apache_mod.o
Reply to: