[Pkg-ocaml-maint-commits] [SCM] ocamlnet packaging branch, master, updated. debian/2.2.9-6-5-g34f0654
Stephane Glondu
steph at glondu.net
Tue Oct 6 14:15:13 UTC 2009
The following commit has been merged in the master branch:
commit 75cba0202a26a73a415d2b7af0e65020ca3918ef
Author: Stephane Glondu <steph at glondu.net>
Date: Tue Oct 6 15:49:10 2009 +0200
Switch patches to quilt
In the meantime, push into a patch direct changes that were made to
configure.
diff --git a/configure b/configure
index 933680c..cd6295f 100755
--- a/configure
+++ b/configure
@@ -658,8 +658,8 @@ if [ $enable_apache -gt 0 ]; then
apache=`get_path apache`
fi
- if [ -x "$apxs" ] ; then
- apache_major=2
+ if [ -x "$apxs" ] && [ -x "$apache" ]; then
+ apache_major=`$apache -v | head -n1 | sed -e "s,.*/\([1-9]\).*,\1,"`
apache_libdir="`$apxs -q LIBEXECDIR`"
apache_incdir="`$apxs -q INCLUDEDIR`"
apache_confdir="`$apxs -q SYSCONFDIR`"
diff --git a/debian/control b/debian/control
index 42fc902..a3e2193 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
Stéphane Glondu <glondu at debian.org>
Build-Depends:
debhelper (>> 7),
- dpatch,
+ quilt,
cdbs,
dh-ocaml (>= 0.9),
ocaml-nox (>= 3.11.1-3~),
diff --git a/debian/patches/0001-Camlp4-workarounds.patch b/debian/patches/0001-Camlp4-workarounds.patch
new file mode 100644
index 0000000..5d17c0d
--- /dev/null
+++ b/debian/patches/0001-Camlp4-workarounds.patch
@@ -0,0 +1,40 @@
+From: Stefano Zacchiroli <zack at debian.org>
+Date: Tue, 6 Oct 2009 15:28:14 +0200
+Subject: [PATCH] Camlp4 workarounds
+
+Work around a non backward compatible change in camlp4 3.10 namely,
+when camlp4.macro is loaded "`IN" is no longer a valid polymorphic
+variant name. Thanks to Fedora for the patch, original source:
+http://cvs.fedoraproject.org/viewvc/devel/ocaml-ocamlnet/ocamlnet-ocaml310.patch?revision=1.1
+
+Signed-off-by: Stefano Zacchiroli <zack at debian.org>
+---
+ src/equeue-gtk1/uq_gtk.ml | 7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/src/equeue-gtk1/uq_gtk.ml b/src/equeue-gtk1/uq_gtk.ml
+index ac99a2d..9b2c348 100644
+--- a/src/equeue-gtk1/uq_gtk.ml
++++ b/src/equeue-gtk1/uq_gtk.ml
+@@ -3,6 +3,11 @@
+ open Equeue
+ open Unixqueue
+
++(* Ugly hack required to compile under OCaml 3.10. This unmarshals
++ * `IN. IN is a reserved word for Camlp4.Macro.
++ *)
++let __in = (Marshal.from_string "\132\149\166\190\000\000\000\003\000\000\000\000\000\000\000\000\000\000\000\000\001?\229" 0 : GMain.Io.condition)
++
+ IFDEF GTK1 THEN
+ type event_id = GMain.Io.event_source
+ ELSE
+@@ -147,7 +152,7 @@ object (self)
+ gtk_event_source_hup = None; } in
+ ( match g.gtk_event_source_in with
+ None when i ->
+- g.gtk_event_source_in <- Some(mk_handler `IN [fd] [] []);
++ g.gtk_event_source_in <- Some(mk_handler __in [fd] [] []);
+ | Some s when not i ->
+ dest_handler s;
+ g.gtk_event_source_in <- None
+--
diff --git a/debian/patches/0002-Enable-struct-ucred.patch b/debian/patches/0002-Enable-struct-ucred.patch
new file mode 100644
index 0000000..be779d1
--- /dev/null
+++ b/debian/patches/0002-Enable-struct-ucred.patch
@@ -0,0 +1,26 @@
+From: Stefano Zacchiroli <zack at debian.org>
+Date: Tue, 6 Oct 2009 15:31:41 +0200
+Subject: [PATCH] Enable struct ucred
+
+"struct ucred" is defined only if GNU extensions are enabled, hence
+enable them (fix FTBFS with gcc)
+
+Signed-off-by: Stefano Zacchiroli <zack at debian.org>
+---
+ src/rpc-auth-local/rpclocal.c | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/rpc-auth-local/rpclocal.c b/src/rpc-auth-local/rpclocal.c
+index 6076fc8..191fee6 100644
+--- a/src/rpc-auth-local/rpclocal.c
++++ b/src/rpc-auth-local/rpclocal.c
+@@ -3,6 +3,8 @@
+ *
+ */
+
++#define _GNU_SOURCE 1
++
+ #include "caml/mlvalues.h"
+ #include "caml/alloc.h"
+ #include "caml/memory.h"
+--
diff --git a/debian/patches/0003-Link-against-the-PIC-version-of-libcamlrun.patch b/debian/patches/0003-Link-against-the-PIC-version-of-libcamlrun.patch
new file mode 100644
index 0000000..ebbd899
--- /dev/null
+++ b/debian/patches/0003-Link-against-the-PIC-version-of-libcamlrun.patch
@@ -0,0 +1,23 @@
+From: Stefano Zacchiroli <zack at debian.org>
+Date: Tue, 6 Oct 2009 15:32:48 +0200
+Subject: [PATCH] Link against the PIC version of libcamlrun
+
+Signed-off-by: Stefano Zacchiroli <zack at debian.org>
+---
+ src/netcgi2-apache/Makefile.def | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/netcgi2-apache/Makefile.def b/src/netcgi2-apache/Makefile.def
+index 8175361..c953a71 100644
+--- a/src/netcgi2-apache/Makefile.def
++++ b/src/netcgi2-apache/Makefile.def
+@@ -46,7 +46,7 @@ endif
+ ### 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) $(APACHE_OCAMLLIBS)
++ $(APXS) -c -o $@ $^ -L$(APACHE_OCAMLLIBDIR) $(patsubst -lcamlrun,-lcamlrun_shared,$(APACHE_OCAMLLIBS))
+ test -f .libs/$@ && cp .libs/$@ .
+
+ netcgi_apache_mod.lo: netcgi_apache_mod.o
+--
diff --git a/debian/patches/0004-Add-rpath-to-Apache-module.patch b/debian/patches/0004-Add-rpath-to-Apache-module.patch
new file mode 100644
index 0000000..04ac85f
--- /dev/null
+++ b/debian/patches/0004-Add-rpath-to-Apache-module.patch
@@ -0,0 +1,26 @@
+From: Stefano Zacchiroli <zack at debian.org>
+Date: Tue, 6 Oct 2009 15:34:00 +0200
+Subject: [PATCH] Add rpath to Apache module
+
+Add rpath to Apache module, pointing to `ocamlc -where`. Rationale:
+ensure libcamlrun_shared.so can be found.
+
+Signed-off-by: Stefano Zacchiroli <zack at debian.org>
+---
+ src/netcgi2-apache/Makefile.def | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/netcgi2-apache/Makefile.def b/src/netcgi2-apache/Makefile.def
+index c953a71..130fb2f 100644
+--- a/src/netcgi2-apache/Makefile.def
++++ b/src/netcgi2-apache/Makefile.def
+@@ -46,7 +46,7 @@ endif
+ ### 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
+--
diff --git a/debian/patches/0005-Avoid-shipping-GPL-license-text.patch b/debian/patches/0005-Avoid-shipping-GPL-license-text.patch
new file mode 100644
index 0000000..07137b9
--- /dev/null
+++ b/debian/patches/0005-Avoid-shipping-GPL-license-text.patch
@@ -0,0 +1,39 @@
+From: Stefano Zacchiroli <zack at debian.org>
+Date: Tue, 6 Oct 2009 15:35:24 +0200
+Subject: [PATCH] Avoid shipping GPL license text
+
+We have it in Debian!
+
+Signed-off-by: Stefano Zacchiroli <zack at debian.org>
+---
+ src/nethttpd-for-netcgi1/Makefile.pre | 2 +-
+ src/nethttpd-for-netcgi2/Makefile.pre | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/nethttpd-for-netcgi1/Makefile.pre b/src/nethttpd-for-netcgi1/Makefile.pre
+index 83ff47a..bdb0874 100644
+--- a/src/nethttpd-for-netcgi1/Makefile.pre
++++ b/src/nethttpd-for-netcgi1/Makefile.pre
+@@ -4,7 +4,7 @@ PRE = 1
+ PKGNAME = nethttpd-for-netcgi1
+ GENERATE = META
+
+-INSTALL_EXTRA += LICENSE
++INSTALL_EXTRA +=
+
+ PP_OPTIONS = -package "camlp4, camlp4.macro" -syntax "camlp4o"
+
+diff --git a/src/nethttpd-for-netcgi2/Makefile.pre b/src/nethttpd-for-netcgi2/Makefile.pre
+index aa6c72c..41f17e1 100644
+--- a/src/nethttpd-for-netcgi2/Makefile.pre
++++ b/src/nethttpd-for-netcgi2/Makefile.pre
+@@ -13,7 +13,7 @@ PRE = 1
+ PKGNAME = nethttpd-for-netcgi2
+ GENERATE = META $(COPY_OVER)
+
+-INSTALL_EXTRA += LICENSE
++INSTALL_EXTRA +=
+
+ PP_OPTIONS = -package "camlp4, camlp4.macro" -syntax "camlp4o"
+
+--
diff --git a/debian/patches/0006-Create-installation-directories.patch b/debian/patches/0006-Create-installation-directories.patch
new file mode 100644
index 0000000..3ebcafa
--- /dev/null
+++ b/debian/patches/0006-Create-installation-directories.patch
@@ -0,0 +1,24 @@
+From: Stefano Zacchiroli <zack at debian.org>
+Date: Tue, 6 Oct 2009 15:36:30 +0200
+Subject: [PATCH] Create installation directories
+
+...since ocamlfind doesn't
+
+Signed-off-by: Stefano Zacchiroli <zack at debian.org>
+---
+ Makefile | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index ce83c7b..e47c8f8 100644
+--- a/Makefile
++++ b/Makefile
+@@ -46,6 +46,7 @@ doc:
+ # The following PHONY rule is important for Cygwin:
+ .PHONY: install
+ install:
++ mkdir -p $(DESTDIR) $(OCAMLFIND_DESTDIR) $(OCAMLFIND_DESTDIR)/stublibs
+ for pkg in $(PKGLIST); do \
+ ( cd src/$$pkg && $(MAKE) -f Makefile.pre install ) || exit; \
+ done
+--
diff --git a/debian/patches/0007-Added-missing-shebang-lines-in-example-shell-scripts.patch b/debian/patches/0007-Added-missing-shebang-lines-in-example-shell-scripts.patch
new file mode 100644
index 0000000..a957e17
--- /dev/null
+++ b/debian/patches/0007-Added-missing-shebang-lines-in-example-shell-scripts.patch
@@ -0,0 +1,27 @@
+From: Stefano Zacchiroli <zack at debian.org>
+Date: Tue, 6 Oct 2009 15:37:34 +0200
+Subject: [PATCH] Added missing shebang lines in example shell scripts
+
+Signed-off-by: Stefano Zacchiroli <zack at debian.org>
+---
+ examples/cgi/netcgi2-plex/compile.sh | 1 +
+ examples/cgi/netcgi2-plex/run.sh | 1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/examples/cgi/netcgi2-plex/compile.sh b/examples/cgi/netcgi2-plex/compile.sh
+index d4aeb1e..1ee873a 100755
+--- a/examples/cgi/netcgi2-plex/compile.sh
++++ b/examples/cgi/netcgi2-plex/compile.sh
+@@ -1,2 +1,3 @@
++#!/bin/sh
+ export OCAMLPATH=../../../src
+ make
+diff --git a/examples/cgi/netcgi2-plex/run.sh b/examples/cgi/netcgi2-plex/run.sh
+index 5f66420..b786ede 100755
+--- a/examples/cgi/netcgi2-plex/run.sh
++++ b/examples/cgi/netcgi2-plex/run.sh
+@@ -1,2 +1,3 @@
++#!/bin/sh
+ export LD_LIBRARY_PATH=../../../src/netsys:../../../src/netstring
+ exec ./netplex -conf netplex.cfg "$@"
+--
diff --git a/debian/patches/0008-Do-not-install-apache.info-file.patch b/debian/patches/0008-Do-not-install-apache.info-file.patch
new file mode 100644
index 0000000..4be0236
--- /dev/null
+++ b/debian/patches/0008-Do-not-install-apache.info-file.patch
@@ -0,0 +1,25 @@
+From: Stefano Zacchiroli <zack at debian.org>
+Date: Tue, 6 Oct 2009 15:38:27 +0200
+Subject: [PATCH] Do not install *apache.info file
+
+It is not needed with Apache 2.
+
+Signed-off-by: Stefano Zacchiroli <zack at debian.org>
+---
+ src/netcgi2-apache/Makefile.def | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/netcgi2-apache/Makefile.def b/src/netcgi2-apache/Makefile.def
+index 130fb2f..956d42f 100644
+--- a/src/netcgi2-apache/Makefile.def
++++ b/src/netcgi2-apache/Makefile.def
+@@ -10,7 +10,7 @@ OBJECTS = netcgi_apache.cmo netcgi_modtpl.cmo
+ DOBJECTS = netcgi_apache.mli netcgi_modtpl.mli
+
+ ALL_EXTRA = mod_netcgi_apache.so
+-INSTALL_EXTRA = mod_netcgi_apache.so 500netcgi_apache.info
++INSTALL_EXTRA = mod_netcgi_apache.so
+
+ include $(TOP_DIR)/Makefile.rules
+
+--
diff --git a/debian/patches/0009-Recognize-GNU-kFreeBSD-as-FreeBSD.patch b/debian/patches/0009-Recognize-GNU-kFreeBSD-as-FreeBSD.patch
new file mode 100644
index 0000000..9e8d34e
--- /dev/null
+++ b/debian/patches/0009-Recognize-GNU-kFreeBSD-as-FreeBSD.patch
@@ -0,0 +1,22 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Tue, 6 Oct 2009 15:39:29 +0200
+Subject: [PATCH] Recognize GNU/kFreeBSD as FreeBSD
+
+---
+ configure | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index cd6295f..3e024ee 100755
+--- a/configure
++++ b/configure
+@@ -384,7 +384,7 @@ case "$u" in
+ with_rpc_auth_local=1
+ [ -n "$adh_style" ] || adh_style=unixdomain
+ ;;
+- FreeBSD)
++ *FreeBSD)
+ echo "FreeBSD"
+ [ -n "$adh_style" ] || adh_style=unixdomain
+ ;;
+--
diff --git a/debian/patches/fix_ssl_bindings.dpatch b/debian/patches/0010-Fix-faulty-ssl-bindings-closes-450903.patch
old mode 100755
new mode 100644
similarity index 77%
rename from debian/patches/fix_ssl_bindings.dpatch
rename to debian/patches/0010-Fix-faulty-ssl-bindings-closes-450903.patch
index 5c71d8a..67ad646
--- a/debian/patches/fix_ssl_bindings.dpatch
+++ b/debian/patches/0010-Fix-faulty-ssl-bindings-closes-450903.patch
@@ -1,12 +1,16 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_ssl_bindings.dpatch by Romain Beauxis <toots at rastageeks.org>
-##
-## All lines beginning with ## DP:' are a description of the patch.
-## DP: fix faulty ssl bindings (closes: #450903)
+From: Romain Beauxis <toots at rastageeks.org>
+Date: Tue, 6 Oct 2009 15:40:05 +0200
+Subject: [PATCH] Fix faulty ssl bindings (closes: #450903)
- at DPATCH@
---- ocamlnet-2.2.8.1.orig/src/equeue-ssl/ssl_exts_stubs.c
-+++ ocamlnet-2.2.8.1/src/equeue-ssl/ssl_exts_stubs.c
+Signed-off-by: Romain Beauxis <toots at rastageeks.org>
+---
+ src/equeue-ssl/ssl_exts_stubs.c | 50 ++++++++++++++++++---------------------
+ 1 files changed, 23 insertions(+), 27 deletions(-)
+
+diff --git a/src/equeue-ssl/ssl_exts_stubs.c b/src/equeue-ssl/ssl_exts_stubs.c
+index db7ceab..c78c2cf 100644
+--- a/src/equeue-ssl/ssl_exts_stubs.c
++++ b/src/equeue-ssl/ssl_exts_stubs.c
@@ -6,41 +6,29 @@
#include <caml/memory.h>
#include <caml/misc.h>
@@ -56,7 +60,7 @@
CAMLreturn(Val_unit);
}
-@@ -52,8 +40,10 @@
+@@ -52,8 +40,10 @@ CAMLprim value ocaml_ssl_get_shutdown(value socket)
CAMLlocal3(rcvd,sent,ret);
int r;
@@ -69,7 +73,7 @@
rcvd = Val_bool(r & SSL_RECEIVED_SHUTDOWN);
sent = Val_bool(r & SSL_SENT_SHUTDOWN);
ret = alloc_tuple(2);
-@@ -71,8 +61,10 @@
+@@ -71,8 +61,10 @@ CAMLprim value ocaml_ssl_get_rbio_eof(value socket)
BIO *b;
int eof;
@@ -82,7 +86,7 @@
if (b == NULL)
failwith("Ssl.get_rbio_eof: No rbio found");
eof = BIO_eof(b);
-@@ -87,8 +79,10 @@
+@@ -87,8 +79,10 @@ CAMLprim value ocaml_ssl_get_mode(value socket)
CAMLparam1(socket);
CAMLlocal1(ret);
long m;
@@ -95,7 +99,7 @@
ret = alloc_tuple(3);
Store_field(ret, 0, Val_bool(m & SSL_MODE_ENABLE_PARTIAL_WRITE));
Store_field(ret, 1, Val_bool(m & SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER));
-@@ -100,12 +94,14 @@
+@@ -100,12 +94,14 @@ CAMLprim value ocaml_ssl_set_mode(value socket, value mode)
{
CAMLparam2(socket,mode);
long m;
@@ -111,3 +115,5 @@
+ caml_leave_blocking_section();
CAMLreturn(Val_unit);
}
+
+--
diff --git a/debian/patches/0011-Force-major-version-for-apache-to-2.patch b/debian/patches/0011-Force-major-version-for-apache-to-2.patch
new file mode 100644
index 0000000..24933a4
--- /dev/null
+++ b/debian/patches/0011-Force-major-version-for-apache-to-2.patch
@@ -0,0 +1,29 @@
+From: Stefano Zacchiroli <zack at upsilon.cc>
+Date: Mon, 8 Sep 2008 21:55:44 +0200
+Subject: [PATCH] Force major version for apache to 2
+
+Rationale: in Debian we currently only build against apache 2, and
+forcing it enables relaxing the build-dependency against
+apache2-mpm-worker (one of the packages shipping /usr/sbin/apache2)
+
+Signed-off-by: Stefano Zacchiroli <zack at upsilon.cc>
+---
+ configure | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 3e024ee..8fe0dbf 100755
+--- a/configure
++++ b/configure
+@@ -658,8 +658,8 @@ if [ $enable_apache -gt 0 ]; then
+ apache=`get_path apache`
+ fi
+
+- if [ -x "$apxs" ] && [ -x "$apache" ]; then
+- apache_major=`$apache -v | head -n1 | sed -e "s,.*/\([1-9]\).*,\1,"`
++ if [ -x "$apxs" ] ; then
++ apache_major=2
+ apache_libdir="`$apxs -q LIBEXECDIR`"
+ apache_incdir="`$apxs -q INCLUDEDIR`"
+ apache_confdir="`$apxs -q SYSCONFDIR`"
+--
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index a0bb02c..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,10 +0,0 @@
-camlp4-workarounds.dpatch
-enable_struct_ucred.dpatch
-camlrun_shared.dpatch
-rpath-apache.dpatch
-dont_install_gpl.dpatch
-mkdir_destdir.dpatch
-missing_shebangs.dpatch
-no_apache_info.dpatch
-configure_kfreebsd.dpatch
-fix_ssl_bindings.dpatch
diff --git a/debian/patches/camlp4-workarounds.dpatch b/debian/patches/camlp4-workarounds.dpatch
deleted file mode 100755
index 14e7e49..0000000
--- a/debian/patches/camlp4-workarounds.dpatch
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## camlp4-workarounds.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Work around a non backward compatible change in camlp4 3.10
-## DP: namely, when camlp4.macro is loaded "`IN" is no longer a valid
-## DP: polymorphic variant name.
-## DP: Thanks to Fedora for the patch, original source:
-## DP: http://cvs.fedoraproject.org/viewvc/devel/ocaml-ocamlnet/ocamlnet-ocaml310.patch?revision=1.1
-
- at DPATCH@
-diff -urNad ocamlnet~/src/equeue-gtk1/uq_gtk.ml ocamlnet/src/equeue-gtk1/uq_gtk.ml
---- ocamlnet~/src/equeue-gtk1/uq_gtk.ml 2009-02-26 23:46:06.000000000 +0100
-+++ ocamlnet/src/equeue-gtk1/uq_gtk.ml 2009-02-27 00:13:24.351111692 +0100
-@@ -3,6 +3,11 @@
- open Equeue
- open Unixqueue
-
-+(* Ugly hack required to compile under OCaml 3.10. This unmarshals
-+ * `IN. IN is a reserved word for Camlp4.Macro.
-+ *)
-+let __in = (Marshal.from_string "\132\149\166\190\000\000\000\003\000\000\000\000\000\000\000\000\000\000\000\000\001?\229" 0 : GMain.Io.condition)
-+
- IFDEF GTK1 THEN
- type event_id = GMain.Io.event_source
- ELSE
-@@ -147,7 +152,7 @@
- gtk_event_source_hup = None; } in
- ( match g.gtk_event_source_in with
- None when i ->
-- g.gtk_event_source_in <- Some(mk_handler `IN [fd] [] []);
-+ g.gtk_event_source_in <- Some(mk_handler __in [fd] [] []);
- | Some s when not i ->
- dest_handler s;
- g.gtk_event_source_in <- None
diff --git a/debian/patches/camlrun_shared.dpatch b/debian/patches/camlrun_shared.dpatch
deleted file mode 100755
index 554b133..0000000
--- a/debian/patches/camlrun_shared.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## camlrun_shared.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: link against the PIC version of libcamlrun
-
- at DPATCH@
-diff -urNad trunk~/src/netcgi2-apache/Makefile.def trunk/src/netcgi2-apache/Makefile.def
---- trunk~/src/netcgi2-apache/Makefile.def 2007-07-31 18:20:59.000000000 +0200
-+++ trunk/src/netcgi2-apache/Makefile.def 2007-09-28 16:29:24.000000000 +0200
-@@ -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) $(APACHE_OCAMLLIBS)
-+ $(APXS) -c -o $@ $^ -L$(APACHE_OCAMLLIBDIR) $(patsubst -lcamlrun,-lcamlrun_shared,$(APACHE_OCAMLLIBS))
- test -f .libs/$@ && cp .libs/$@ .
-
- netcgi_apache_mod.lo: netcgi_apache_mod.o
diff --git a/debian/patches/configure_kfreebsd.dpatch b/debian/patches/configure_kfreebsd.dpatch
deleted file mode 100755
index f15d6f4..0000000
--- a/debian/patches/configure_kfreebsd.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## configure_kfreebsd.dpatch by Stephane Glondu <steph at glondu.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: recognize GNU/kFreeBSD as FreeBSD
-
- at DPATCH@
---- trunk~/configure 2008-01-17 23:29:04.000000000 +0100
-+++ trunk/configure 2008-01-17 23:31:39.000000000 +0100
-@@ -384,7 +384,7 @@
- with_rpc_auth_local=1
- [ -n "$adh_style" ] || adh_style=unixdomain
- ;;
-- FreeBSD)
-+ *FreeBSD)
- echo "FreeBSD"
- [ -n "$adh_style" ] || adh_style=unixdomain
- ;;
diff --git a/debian/patches/dont_install_gpl.dpatch b/debian/patches/dont_install_gpl.dpatch
deleted file mode 100755
index 1d07567..0000000
--- a/debian/patches/dont_install_gpl.dpatch
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## dont_install_gpl.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: avoid shipping GPL license text, we have it in Debian!
-
- at DPATCH@
-diff -urNad trunk~/src/nethttpd-for-netcgi1/Makefile.pre trunk/src/nethttpd-for-netcgi1/Makefile.pre
---- trunk~/src/nethttpd-for-netcgi1/Makefile.pre 2006-12-28 20:05:28.000000000 +0100
-+++ trunk/src/nethttpd-for-netcgi1/Makefile.pre 2007-01-02 15:12:11.000000000 +0100
-@@ -4,7 +4,7 @@
- PKGNAME = nethttpd-for-netcgi1
- GENERATE = META
-
--INSTALL_EXTRA += LICENSE
-+INSTALL_EXTRA +=
-
- PP_OPTIONS = -package "camlp4, camlp4.macro" -syntax "camlp4o"
-
-diff -urNad trunk~/src/nethttpd-for-netcgi2/Makefile.pre trunk/src/nethttpd-for-netcgi2/Makefile.pre
---- trunk~/src/nethttpd-for-netcgi2/Makefile.pre 2006-12-28 20:05:28.000000000 +0100
-+++ trunk/src/nethttpd-for-netcgi2/Makefile.pre 2007-01-02 15:12:16.000000000 +0100
-@@ -13,7 +13,7 @@
- PKGNAME = nethttpd-for-netcgi2
- GENERATE = META $(COPY_OVER)
-
--INSTALL_EXTRA += LICENSE
-+INSTALL_EXTRA +=
-
- PP_OPTIONS = -package "camlp4, camlp4.macro" -syntax "camlp4o"
-
diff --git a/debian/patches/enable_struct_ucred.dpatch b/debian/patches/enable_struct_ucred.dpatch
deleted file mode 100755
index a7a90ef..0000000
--- a/debian/patches/enable_struct_ucred.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## make_struct_ucred_visible.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: "struct ucred" is defined only if GNU extensions are enabled,
-## DP: hence enable them (fix FTBFS with gcc)
-
- at DPATCH@
-diff -urNad ocamlnet~/src/rpc-auth-local/rpclocal.c ocamlnet/src/rpc-auth-local/rpclocal.c
---- ocamlnet~/src/rpc-auth-local/rpclocal.c 2009-02-26 19:03:10.000000000 +0100
-+++ ocamlnet/src/rpc-auth-local/rpclocal.c 2009-02-26 19:04:42.267606017 +0100
-@@ -3,6 +3,8 @@
- *
- */
-
-+#define _GNU_SOURCE 1
-+
- #include "caml/mlvalues.h"
- #include "caml/alloc.h"
- #include "caml/memory.h"
diff --git a/debian/patches/missing_shebangs.dpatch b/debian/patches/missing_shebangs.dpatch
deleted file mode 100755
index 255a3b7..0000000
--- a/debian/patches/missing_shebangs.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## missing_shebangs.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: added missing shebang lines in example shell scripts
-
- at DPATCH@
-diff -urNad trunk~/examples/cgi/netcgi2-plex/compile.sh trunk/examples/cgi/netcgi2-plex/compile.sh
---- trunk~/examples/cgi/netcgi2-plex/compile.sh 2007-01-02 17:13:51.000000000 +0100
-+++ trunk/examples/cgi/netcgi2-plex/compile.sh 2007-01-03 13:42:04.000000000 +0100
-@@ -1,2 +1,3 @@
-+#!/bin/sh
- export OCAMLPATH=../../../src
- make
-diff -urNad trunk~/examples/cgi/netcgi2-plex/run.sh trunk/examples/cgi/netcgi2-plex/run.sh
---- trunk~/examples/cgi/netcgi2-plex/run.sh 2007-01-02 17:13:51.000000000 +0100
-+++ trunk/examples/cgi/netcgi2-plex/run.sh 2007-01-03 13:42:05.000000000 +0100
-@@ -1,2 +1,3 @@
-+#!/bin/sh
- export LD_LIBRARY_PATH=../../../src/netsys:../../../src/netstring
- exec ./netplex -conf netplex.cfg "$@"
diff --git a/debian/patches/mkdir_destdir.dpatch b/debian/patches/mkdir_destdir.dpatch
deleted file mode 100755
index 58bf08e..0000000
--- a/debian/patches/mkdir_destdir.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## mkdir_destdir.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: create installation destination directories, since ocamlfind doesn't
-
- at DPATCH@
-diff -urNad trunk~/Makefile trunk/Makefile
---- trunk~/Makefile 2007-01-02 17:13:47.000000000 +0100
-+++ trunk/Makefile 2007-01-03 13:27:36.000000000 +0100
-@@ -46,6 +46,7 @@
- # The following PHONY rule is important for Cygwin:
- .PHONY: install
- install:
-+ mkdir -p $(DESTDIR) $(OCAMLFIND_DESTDIR) $(OCAMLFIND_DESTDIR)/stublibs
- for pkg in $(PKGLIST); do \
- ( cd src/$$pkg && $(MAKE) -f Makefile.pre install ) || exit; \
- done
diff --git a/debian/patches/no_apache_info.dpatch b/debian/patches/no_apache_info.dpatch
deleted file mode 100755
index 5bfc1a8..0000000
--- a/debian/patches/no_apache_info.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## no_apache_info.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: do not install *apache.info file, not needed with Apache 2
-
- at DPATCH@
-diff -urNad trunk~/src/netcgi2-apache/Makefile.def trunk/src/netcgi2-apache/Makefile.def
---- trunk~/src/netcgi2-apache/Makefile.def 2007-07-31 18:20:59.000000000 +0200
-+++ trunk/src/netcgi2-apache/Makefile.def 2007-09-09 09:57:00.000000000 +0200
-@@ -10,7 +10,7 @@
- DOBJECTS = netcgi_apache.mli netcgi_modtpl.mli
-
- ALL_EXTRA = mod_netcgi_apache.so
--INSTALL_EXTRA = mod_netcgi_apache.so 500netcgi_apache.info
-+INSTALL_EXTRA = mod_netcgi_apache.so
-
- include $(TOP_DIR)/Makefile.rules
-
diff --git a/debian/patches/rpath-apache.dpatch b/debian/patches/rpath-apache.dpatch
deleted file mode 100755
index ebe6a0a..0000000
--- a/debian/patches/rpath-apache.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## rpath-apache.dpatch by Stefano Zacchiroli <zack at 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
-
- at 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
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..39266be
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,11 @@
+0001-Camlp4-workarounds.patch
+0002-Enable-struct-ucred.patch
+0003-Link-against-the-PIC-version-of-libcamlrun.patch
+0004-Add-rpath-to-Apache-module.patch
+0005-Avoid-shipping-GPL-license-text.patch
+0006-Create-installation-directories.patch
+0007-Added-missing-shebang-lines-in-example-shell-scripts.patch
+0008-Do-not-install-apache.info-file.patch
+0009-Recognize-GNU-kFreeBSD-as-FreeBSD.patch
+0010-Fix-faulty-ssl-bindings-closes-450903.patch
+0011-Force-major-version-for-apache-to-2.patch
diff --git a/debian/rules b/debian/rules
index ccf4ad2..3e0dc48 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/ocaml.mk
include /usr/share/cdbs/1/class/makefile.mk
--
ocamlnet packaging
More information about the Pkg-ocaml-maint-commits
mailing list