[Pkg-ocaml-maint-commits] [SCM] ocamlnet packaging branch, experimental/master, updated. debian/2.2.9-8-21-g4f8417b
Stephane Glondu
steph at glondu.net
Sun Jul 3 20:26:29 UTC 2011
The following commit has been merged in the experimental/master branch:
commit 8d0d92efe45f88b5e0a08b9385913d184bd4d0a1
Author: Eric Cooper <ecc at cmu.edu>
Date: Sat Mar 5 14:21:21 2011 -0500
Update patches for new upstream version
diff --git a/debian/patches/0001-Camlp4-workarounds.patch b/debian/patches/0001-Camlp4-workarounds.patch
deleted file mode 100644
index 5d17c0d..0000000
--- a/debian/patches/0001-Camlp4-workarounds.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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
deleted file mode 100644
index be779d1..0000000
--- a/debian/patches/0002-Enable-struct-ucred.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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/0009-Recognize-GNU-kFreeBSD-as-FreeBSD.patch b/debian/patches/0009-Recognize-GNU-kFreeBSD-as-FreeBSD.patch
deleted file mode 100644
index 9e8d34e..0000000
--- a/debian/patches/0009-Recognize-GNU-kFreeBSD-as-FreeBSD.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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/0010-Fix-faulty-ssl-bindings-closes-450903.patch b/debian/patches/0010-Fix-faulty-ssl-bindings-closes-450903.patch
deleted file mode 100644
index 67ad646..0000000
--- a/debian/patches/0010-Fix-faulty-ssl-bindings-closes-450903.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From: Romain Beauxis <toots at rastageeks.org>
-Date: Tue, 6 Oct 2009 15:40:05 +0200
-Subject: [PATCH] Fix faulty ssl bindings (closes: #450903)
-
-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>
- #include <caml/mlvalues.h>
--
-+#include <caml/signals.h>
- #include <openssl/ssl.h>
- #include <openssl/pem.h>
- #include <openssl/err.h>
- #include <openssl/bio.h>
- #include <unistd.h>
-
--
--/* The following definitions are copied from ssl_stubs.c: */
--
--struct ssl_socket__t
--{
-- SSL *handler;
-- int fd;
--};
--
--typedef struct ssl_socket__t ssl_socket_t;
--
--static ssl_socket_t* ssl_socket_of_block(value block)
--{
-- return (ssl_socket_t*)Field(block, 1);
--}
-+#define SSL_val(v) (*((SSL**)Data_custom_val(v)))
-
-
- CAMLprim value ocaml_ssl_single_shutdown(value socket)
- {
- CAMLparam1(socket);
- int ret;
-- ssl_socket_t *ssl = ssl_socket_of_block(socket);
-
-- ret = SSL_shutdown(ssl->handler);
-+ SSL *ssl = SSL_val(socket);
-+ caml_enter_blocking_section();
-+ ret = SSL_shutdown(ssl);
- if (ret == -1) {
- raise_with_arg(*caml_named_value("ssl_exn_shutdown_error"),
-- Val_int(SSL_get_error(ssl->handler, ret)));
-+ Val_int(SSL_get_error(ssl, ret)));
- };
-+ caml_leave_blocking_section();
-
- CAMLreturn(Val_unit);
- }
-@@ -52,8 +40,10 @@ CAMLprim value ocaml_ssl_get_shutdown(value socket)
- CAMLlocal3(rcvd,sent,ret);
- int r;
-
-- ssl_socket_t *ssl = ssl_socket_of_block(socket);
-- r = SSL_get_shutdown(ssl->handler);
-+ SSL *ssl = SSL_val(socket);
-+ caml_enter_blocking_section();
-+ r = SSL_get_shutdown(ssl);
-+ caml_leave_blocking_section();
- rcvd = Val_bool(r & SSL_RECEIVED_SHUTDOWN);
- sent = Val_bool(r & SSL_SENT_SHUTDOWN);
- ret = alloc_tuple(2);
-@@ -71,8 +61,10 @@ CAMLprim value ocaml_ssl_get_rbio_eof(value socket)
- BIO *b;
- int eof;
-
-- ssl_socket_t *ssl = ssl_socket_of_block(socket);
-- b = SSL_get_rbio(ssl->handler);
-+ SSL *ssl = SSL_val(socket);
-+ caml_enter_blocking_section();
-+ b = SSL_get_rbio(ssl);
-+ caml_leave_blocking_section();
- if (b == NULL)
- failwith("Ssl.get_rbio_eof: No rbio found");
- eof = BIO_eof(b);
-@@ -87,8 +79,10 @@ CAMLprim value ocaml_ssl_get_mode(value socket)
- CAMLparam1(socket);
- CAMLlocal1(ret);
- long m;
-- ssl_socket_t *ssl = ssl_socket_of_block(socket);
-- m = SSL_get_mode(ssl->handler);
-+ SSL *ssl = SSL_val(socket);
-+ caml_enter_blocking_section();
-+ m = SSL_get_mode(ssl);
-+ caml_leave_blocking_section();
- 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 @@ CAMLprim value ocaml_ssl_set_mode(value socket, value mode)
- {
- CAMLparam2(socket,mode);
- long m;
-- ssl_socket_t *ssl = ssl_socket_of_block(socket);
-+ SSL *ssl = SSL_val(socket);
- m = 0;
- if (Bool_val(Field(mode, 0))) m |= SSL_MODE_ENABLE_PARTIAL_WRITE;
- if (Bool_val(Field(mode, 1))) m |= SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER;
- if (Bool_val(Field(mode, 2))) m |= SSL_MODE_AUTO_RETRY;
-- SSL_set_mode(ssl->handler, m);
-+ caml_enter_blocking_section();
-+ SSL_set_mode(ssl, m);
-+ caml_leave_blocking_section();
- CAMLreturn(Val_unit);
- }
-
---
diff --git a/debian/patches/0012-Use-OCaml-version-to-guess-str-stubs-link-options.patch b/debian/patches/0012-Use-OCaml-version-to-guess-str-stubs-link-options.patch
deleted file mode 100644
index 4e3f726..0000000
--- a/debian/patches/0012-Use-OCaml-version-to-guess-str-stubs-link-options.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Mon, 3 May 2010 20:20:46 +0200
-Subject: [PATCH] Use OCaml version to guess str stubs link options
-
-Closes: #580093.
----
- configure | 11 ++++++++++-
- 1 files changed, 10 insertions(+), 1 deletions(-)
-
-diff --git a/configure b/configure
-index 8fe0dbf..8ed9e36 100755
---- a/configure
-+++ b/configure
-@@ -680,6 +680,15 @@ if [ $enable_apache -gt 0 ]; then
- exit 1
- fi
-
-+ case `ocamlc -version` in
-+ 3.12*)
-+ str_stubs=-lcamlstr
-+ ;;
-+ *)
-+ str_stubs=-lstr
-+ ;;
-+ esac
-+
- fi
-
- ######################################################################
-@@ -786,7 +795,7 @@ AUTHDHREQS = $adh_reqs
- # For -enable-apache
- APACHE_MAJOR = $apache_major
- APACHE_LIBDIR = $apache_libdir
--APACHE_OCAMLLIBS = -lcamlrun -ltermcap -lunix -lstr
-+APACHE_OCAMLLIBS = -lcamlrun -ltermcap -lunix $str_stubs
- APACHE_INCDIR = $apache_incdir
- APACHE_CONFDIR = $apache_confdir
- APACHE_LDFLAGS_SHLIB = $apache_ldflags_shlib
---
diff --git a/debian/patches/Add-netglob_lex.mll-from-upstream-svn.patch b/debian/patches/Add-netglob_lex.mll-from-upstream-svn.patch
new file mode 100644
index 0000000..ff0a82d
--- /dev/null
+++ b/debian/patches/Add-netglob_lex.mll-from-upstream-svn.patch
@@ -0,0 +1,242 @@
+From: Gerd Stolpmann <gerd at gerd-stolpmann.de>
+Date: Fri, 17 Dec 2010 18:24:59 +0000
+Subject: Add netglob_lex.mll from upstream svn
+
+git-svn-id: https://godirepo.camlcity.org/svn/lib-ocamlnet2@1514 96e5b9e0-aa12-0410-9e2e-b23d24e56262
+---
+ src/netstring/netglob_lex.mll | 225 +++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 225 insertions(+), 0 deletions(-)
+ create mode 100644 src/netstring/netglob_lex.mll
+
+diff --git a/src/netstring/netglob_lex.mll b/src/netstring/netglob_lex.mll
+new file mode 100644
+index 0000000..8aa93cc
+--- /dev/null
++++ b/src/netstring/netglob_lex.mll
+@@ -0,0 +1,225 @@
++(* $Id$ *)
++
++{
++ exception Bracket_Unsupported
++ exception Lexing_Error
++
++ type bracket_token =
++ Bracket_char of char
++ | Bracket_range of (char * char)
++ | Bracket_code of int (* see Netglob.reparse_bracket_expr *)
++ | Bracket_end
++
++ type brace_token =
++ Brace_literal of string
++ | Brace_comma
++ | Brace_braces of brace_token list (* inner braces *)
++ | Brace_end
++
++ type glob_features =
++ { enable_star : bool;
++ enable_qmark : bool;
++ enable_brackets : bool;
++ enable_braces : bool;
++ enable_tilde : bool;
++ enable_escape : bool;
++ mutable escaped : bool; (* after a backslash *)
++ }
++
++ type glob_token =
++ Glob_literal of string
++ | Glob_star
++ | Glob_qmark
++ | Glob_brackets of (bool * bracket_token list)
++ | Glob_braces of brace_token list
++ | Glob_tilde of string * bool (* whether there is a slash *)
++ | Glob_end
++
++ type exploded_char =
++ C of char (* An unescaped character *)
++ | E of char (* An escaped character *)
++ | Delim of char (* delimiter *)
++
++
++
++ let rec collect_until end_token parse_fun lexbuf =
++ let tok = parse_fun lexbuf in
++ if tok = end_token then
++ []
++ else
++ tok :: (collect_until end_token parse_fun lexbuf)
++
++
++ let string_of_exploded l =
++ String.concat ""
++ (List.map
++ (function
++ | C c -> String.make 1 c
++ | E c -> String.make 1 c
++ | Delim _ -> ""
++ )
++ l
++ )
++
++ let have_delim l =
++ List.exists (function Delim _ -> true | _ -> false) l
++
++}
++
++(* bracket_rest: Scans a bracket expression beginning at the second
++ * character (where ']' is always the terminating character)
++ *)
++
++rule bracket_rest = parse
++ "[:" [^ ':' ] ":]" { raise Bracket_Unsupported }
++ | "[." [^ '.' ] ".]" { raise Bracket_Unsupported }
++ | "[=" [^ '=' ] "=]" { raise Bracket_Unsupported }
++ | "]" { Bracket_end }
++ | [ ^ ']' ] "-" [^ ']' ]
++ { let c0 = Lexing.lexeme_char lexbuf 0 in
++ let c1 = Lexing.lexeme_char lexbuf 2 in
++ if c0 > '\127' || c1 > '\127' then raise Lexing_Error;
++ if c0 > c1 then raise Lexing_Error;
++ Bracket_range(c0,c1)
++ }
++ | eof { raise Lexing_Error }
++ | [ ^ ']' ] { Bracket_char (Lexing.lexeme_char lexbuf 0) }
++
++(* bracket_first: Scans the first token of a bracket expression
++ * (after "[", "[^", or "[!").
++ * Here, ']' is not recognized as terminating character.
++ *)
++
++and bracket_first = parse
++ "[:" [^ ':' ] ":]" { raise Bracket_Unsupported }
++ | "[." [^ '.' ] ".]" { raise Bracket_Unsupported }
++ | "[=" [^ '=' ] "=]" { raise Bracket_Unsupported }
++ | _ "-" [^ ']' ] { let c0 = Lexing.lexeme_char lexbuf 0 in
++ let c1 = Lexing.lexeme_char lexbuf 2 in
++ if c0 > '\127' || c1 > '\127' then raise Lexing_Error;
++ if c0 > c1 then raise Lexing_Error;
++ Bracket_range(c0,c1)
++ }
++ | eof { raise Lexing_Error }
++ | _ { Bracket_char (Lexing.lexeme_char lexbuf 0) }
++
++
++(* brace: Collects material within brace expressions (case: backslash
++ * is escape character
++ *)
++
++and brace = parse
++ "}" { Brace_end }
++ | "," { Brace_comma }
++ | "{" { let l = collect_until Brace_end brace lexbuf in
++ Brace_braces l }
++ | '\\' _ { Brace_literal (Lexing.lexeme lexbuf) }
++ | [^ '}' ',' '\\' '{' ] { Brace_literal (Lexing.lexeme lexbuf) }
++ | eof { raise Lexing_Error }
++ | _ { raise Lexing_Error }
++
++(* brace_noescape: Used for the case that backslash is not an escape
++ * character
++ *)
++
++and brace_noescape = parse
++ "}" { Brace_end }
++ | "," { Brace_comma }
++ | "{" { let l = collect_until Brace_end brace_noescape lexbuf in
++ Brace_braces l }
++ | [^ '}' ',' '{'] { Brace_literal (Lexing.lexeme lexbuf) }
++ | eof { raise Lexing_Error }
++ | _ { raise Lexing_Error }
++
++and glob_expr feat = parse
++ "*" { if feat.enable_star && not feat.escaped then
++ Glob_star
++ else (
++ feat.escaped <- false;
++ Glob_literal "*"
++ )
++ }
++ | "?" { if feat.enable_qmark && not feat.escaped then
++ Glob_qmark
++ else (
++ feat.escaped <- false;
++ Glob_literal "?"
++ )
++ }
++ | "[" [ '!' '^' ]? { if feat.enable_brackets && not feat.escaped then (
++ let negated =
++ String.length(Lexing.lexeme lexbuf) > 1 in
++ let t0 = bracket_first lexbuf in
++ let l = collect_until
++ Bracket_end bracket_rest lexbuf in
++ Glob_brackets (negated, t0 :: l)
++ )
++ else (
++ feat.escaped <- false;
++ Glob_literal (Lexing.lexeme lexbuf)
++ )
++ }
++ | "{" { if feat.enable_braces && not feat.escaped then (
++ let p =
++ if feat.enable_escape then
++ brace
++ else
++ brace_noescape in
++ let l = collect_until Brace_end p lexbuf in
++ Glob_braces l
++ )
++ else (
++ feat.escaped <- false;
++ Glob_literal "{"
++ )
++ }
++ | "~" { if (feat.enable_tilde && not feat.escaped &&
++ Lexing.lexeme_start lexbuf = 0) then (
++ let p =
++ if feat.enable_escape then
++ generic_lex_until '/'
++ else
++ generic_lex_noescape_until '/' in
++ let l = p lexbuf in
++ let s = string_of_exploded l in
++ let slash = have_delim l in
++ Glob_tilde(s,slash)
++ ) else (
++ feat.escaped <- false;
++ Glob_literal "~"
++ )
++ }
++ | "\\" { if feat.enable_escape && not feat.escaped then (
++ feat.escaped <- true;
++ Glob_literal ""
++ )
++ else (
++ feat.escaped <- false;
++ Glob_literal "\\"
++ )
++ }
++ | [ ^ '*' '?' '[' '{' '\\' '~' ]+
++ { feat.escaped <- false;
++ Glob_literal (Lexing.lexeme lexbuf)
++ }
++ | eof { if feat.escaped then raise Lexing_Error;
++ Glob_end
++ }
++
++and generic_lex_until c = parse
++ '\\' _ { let char = E (Lexing.lexeme_char lexbuf 1) in
++ char :: generic_lex_until c lexbuf }
++ | _ { let lc = Lexing.lexeme_char lexbuf 0 in
++ if c = lc then [ Delim c ] else (
++ let char = C lc in
++ char :: generic_lex_until c lexbuf
++ ) }
++ | eof { [] }
++
++and generic_lex_noescape_until c = parse
++ | _ { let lc = Lexing.lexeme_char lexbuf 0 in
++ if c = lc then [ Delim c ] else (
++ let char = C lc in
++ char :: generic_lex_noescape_until c lexbuf
++ ) }
++ | eof { [] }
+--
diff --git a/debian/patches/0004-Add-rpath-to-Apache-module.patch b/debian/patches/Add-rpath-to-Apache-module.patch
similarity index 79%
rename from debian/patches/0004-Add-rpath-to-Apache-module.patch
rename to debian/patches/Add-rpath-to-Apache-module.patch
index 04ac85f..49d3f44 100644
--- a/debian/patches/0004-Add-rpath-to-Apache-module.patch
+++ b/debian/patches/Add-rpath-to-Apache-module.patch
@@ -1,6 +1,6 @@
From: Stefano Zacchiroli <zack at debian.org>
Date: Tue, 6 Oct 2009 15:34:00 +0200
-Subject: [PATCH] Add rpath to Apache module
+Subject: Add rpath to Apache module
Add rpath to Apache module, pointing to `ocamlc -where`. Rationale:
ensure libcamlrun_shared.so can be found.
@@ -11,12 +11,12 @@ Signed-off-by: Stefano Zacchiroli <zack at debian.org>
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
+index 655fc3c..94ccf33 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
+@@ -49,7 +49,7 @@ endif
+ ### Only works with OCaml >= 3.11 on plafforms where PIC differs from non-PIC
+ ### See http://caml.inria.fr/mantis/view.php?id=3866
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))
diff --git a/debian/patches/0007-Added-missing-shebang-lines-in-example-shell-scripts.patch b/debian/patches/Added-missing-shebang-lines-in-example-shell-scripts.patch
similarity index 82%
rename from debian/patches/0007-Added-missing-shebang-lines-in-example-shell-scripts.patch
rename to debian/patches/Added-missing-shebang-lines-in-example-shell-scripts.patch
index a957e17..ddd501e 100644
--- a/debian/patches/0007-Added-missing-shebang-lines-in-example-shell-scripts.patch
+++ b/debian/patches/Added-missing-shebang-lines-in-example-shell-scripts.patch
@@ -1,6 +1,6 @@
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
+Subject: Added missing shebang lines in example shell scripts
Signed-off-by: Stefano Zacchiroli <zack at debian.org>
---
@@ -17,11 +17,12 @@ index d4aeb1e..1ee873a 100755
export OCAMLPATH=../../../src
make
diff --git a/examples/cgi/netcgi2-plex/run.sh b/examples/cgi/netcgi2-plex/run.sh
-index 5f66420..b786ede 100755
+index fb9cc4e..db6ed56 100755
--- a/examples/cgi/netcgi2-plex/run.sh
+++ b/examples/cgi/netcgi2-plex/run.sh
-@@ -1,2 +1,3 @@
+@@ -1,3 +1,4 @@
+#!/bin/sh
export LD_LIBRARY_PATH=../../../src/netsys:../../../src/netstring
+ export CAML_LD_LIBRARY_PATH=../../../src/netsys:../../../src/netstring
exec ./netplex -conf netplex.cfg "$@"
--
diff --git a/debian/patches/0005-Avoid-shipping-GPL-license-text.patch b/debian/patches/Avoid-shipping-GPL-license-text.patch
similarity index 57%
rename from debian/patches/0005-Avoid-shipping-GPL-license-text.patch
rename to debian/patches/Avoid-shipping-GPL-license-text.patch
index 07137b9..d869afb 100644
--- a/debian/patches/0005-Avoid-shipping-GPL-license-text.patch
+++ b/debian/patches/Avoid-shipping-GPL-license-text.patch
@@ -1,35 +1,34 @@
From: Stefano Zacchiroli <zack at debian.org>
Date: Tue, 6 Oct 2009 15:35:24 +0200
-Subject: [PATCH] Avoid shipping GPL license text
+Subject: 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 +-
+ src/nethttpd/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
+index d1c93f6..16d6c54 100644
--- a/src/nethttpd-for-netcgi2/Makefile.pre
+++ b/src/nethttpd-for-netcgi2/Makefile.pre
-@@ -13,7 +13,7 @@ PRE = 1
+@@ -4,6 +4,6 @@ PRE = 1
PKGNAME = nethttpd-for-netcgi2
- GENERATE = META $(COPY_OVER)
+ GENERATE = META
+
+-INSTALL_EXTRA += LICENSE
++INSTALL_EXTRA +=
+
+ include $(TOP_DIR)/Makefile.rules
+diff --git a/src/nethttpd/Makefile.pre b/src/nethttpd/Makefile.pre
+index 1f8f334..603bc29 100644
+--- a/src/nethttpd/Makefile.pre
++++ b/src/nethttpd/Makefile.pre
+@@ -4,7 +4,7 @@ PRE = 1
+ PKGNAME = nethttpd
+ GENERATE = META
-INSTALL_EXTRA += LICENSE
+INSTALL_EXTRA +=
diff --git a/debian/patches/0006-Create-installation-directories.patch b/debian/patches/Create-installation-directories.patch
similarity index 92%
rename from debian/patches/0006-Create-installation-directories.patch
rename to debian/patches/Create-installation-directories.patch
index 3ebcafa..75bd18f 100644
--- a/debian/patches/0006-Create-installation-directories.patch
+++ b/debian/patches/Create-installation-directories.patch
@@ -1,6 +1,6 @@
From: Stefano Zacchiroli <zack at debian.org>
Date: Tue, 6 Oct 2009 15:36:30 +0200
-Subject: [PATCH] Create installation directories
+Subject: Create installation directories
...since ocamlfind doesn't
diff --git a/debian/patches/0008-Do-not-install-apache.info-file.patch b/debian/patches/Do-not-install-apache.info-file.patch
similarity index 89%
rename from debian/patches/0008-Do-not-install-apache.info-file.patch
rename to debian/patches/Do-not-install-apache.info-file.patch
index 4be0236..ad9cf40 100644
--- a/debian/patches/0008-Do-not-install-apache.info-file.patch
+++ b/debian/patches/Do-not-install-apache.info-file.patch
@@ -1,6 +1,6 @@
From: Stefano Zacchiroli <zack at debian.org>
Date: Tue, 6 Oct 2009 15:38:27 +0200
-Subject: [PATCH] Do not install *apache.info file
+Subject: Do not install *apache.info file
It is not needed with Apache 2.
@@ -10,7 +10,7 @@ Signed-off-by: Stefano Zacchiroli <zack at debian.org>
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
+index 94ccf33..4a520f4 100644
--- a/src/netcgi2-apache/Makefile.def
+++ b/src/netcgi2-apache/Makefile.def
@@ -10,7 +10,7 @@ OBJECTS = netcgi_apache.cmo netcgi_modtpl.cmo
diff --git a/debian/patches/0011-Force-major-version-for-apache-to-2.patch b/debian/patches/Force-major-version-for-apache-to-2.patch
similarity index 85%
rename from debian/patches/0011-Force-major-version-for-apache-to-2.patch
rename to debian/patches/Force-major-version-for-apache-to-2.patch
index 24933a4..f6ea5f6 100644
--- a/debian/patches/0011-Force-major-version-for-apache-to-2.patch
+++ b/debian/patches/Force-major-version-for-apache-to-2.patch
@@ -1,6 +1,6 @@
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
+Subject: 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
@@ -12,10 +12,10 @@ Signed-off-by: Stefano Zacchiroli <zack at upsilon.cc>
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
-index 3e024ee..8fe0dbf 100755
+index 836ca6f..137bbd4 100755
--- a/configure
+++ b/configure
-@@ -658,8 +658,8 @@ if [ $enable_apache -gt 0 ]; then
+@@ -714,8 +714,8 @@ if [ $enable_apache -gt 0 ]; then
apache=`get_path apache`
fi
diff --git a/debian/patches/0003-Link-against-the-PIC-version-of-libcamlrun.patch b/debian/patches/Link-against-the-PIC-version-of-libcamlrun.patch
similarity index 73%
rename from debian/patches/0003-Link-against-the-PIC-version-of-libcamlrun.patch
rename to debian/patches/Link-against-the-PIC-version-of-libcamlrun.patch
index ebbd899..547489b 100644
--- a/debian/patches/0003-Link-against-the-PIC-version-of-libcamlrun.patch
+++ b/debian/patches/Link-against-the-PIC-version-of-libcamlrun.patch
@@ -1,6 +1,6 @@
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
+Subject: Link against the PIC version of libcamlrun
Signed-off-by: Stefano Zacchiroli <zack at debian.org>
---
@@ -8,12 +8,12 @@ Signed-off-by: Stefano Zacchiroli <zack at debian.org>
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
+index e9c1641..655fc3c 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
+@@ -49,7 +49,7 @@ endif
+ ### Only works with OCaml >= 3.11 on plafforms where PIC differs from non-PIC
+ ### See http://caml.inria.fr/mantis/view.php?id=3866
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))
diff --git a/debian/patches/series b/debian/patches/series
index c58144f..9cf6d06 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1,8 @@
-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
-0012-Use-OCaml-version-to-guess-str-stubs-link-options.patch
+Link-against-the-PIC-version-of-libcamlrun.patch
+Add-rpath-to-Apache-module.patch
+Avoid-shipping-GPL-license-text.patch
+Create-installation-directories.patch
+Added-missing-shebang-lines-in-example-shell-scripts.patch
+Do-not-install-apache.info-file.patch
+Force-major-version-for-apache-to-2.patch
+Add-netglob_lex.mll-from-upstream-svn.patch
--
ocamlnet packaging
More information about the Pkg-ocaml-maint-commits
mailing list