pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/ocsigen Updated www/ocsigen to 2.11.0.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/295035e6f942
branches:  trunk
changeset: 318758:295035e6f942
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Tue Jan 29 12:47:02 2019 +0000

description:
Updated www/ocsigen to 2.11.0.

Changes include:
- compatibility with ocaml 4.07
- compatibility with Lwt 4.x (a lot of this was already in patches,
  which I've now been able to remove)
- replace tyxml-parser with xml-light
and some other minor bugfixes and improvements.

diffstat:

 www/ocsigen/Makefile                                                       |    5 +-
 www/ocsigen/distinfo                                                       |   39 +-
 www/ocsigen/patches/patch-src_baselib_ocsigen__stream.ml                   |   18 -
 www/ocsigen/patches/patch-src_extensions_Makefile                          |   16 -
 www/ocsigen/patches/patch-src_extensions_accesscontrol.ml                  |  259 ----------
 www/ocsigen/patches/patch-src_extensions_accesscontrol.mli                 |   11 -
 www/ocsigen/patches/patch-src_extensions_authbasic.ml                      |   23 -
 www/ocsigen/patches/patch-src_extensions_authbasic.mli                     |   23 -
 www/ocsigen/patches/patch-src_extensions_cgimod.ml                         |   74 +--
 www/ocsigen/patches/patch-src_extensions_deflatemod.ml                     |   38 -
 www/ocsigen/patches/patch-src_extensions_extendconfiguration.ml            |  161 ------
 www/ocsigen/patches/patch-src_extensions_extensiontemplate.ml              |   42 -
 www/ocsigen/patches/patch-src_extensions_ocsipersist-dbm_Makefile          |   14 -
 www/ocsigen/patches/patch-src_extensions_ocsipersist-dbm_ocsipersist.ml    |   36 -
 www/ocsigen/patches/patch-src_extensions_ocsipersist-pgsql_Makefile        |   14 -
 www/ocsigen/patches/patch-src_extensions_ocsipersist-pgsql_ocsipersist.ml  |   18 -
 www/ocsigen/patches/patch-src_extensions_ocsipersist-sqlite_Makefile       |   18 -
 www/ocsigen/patches/patch-src_extensions_ocsipersist-sqlite_ocsipersist.ml |   18 -
 www/ocsigen/patches/patch-src_extensions_revproxy.ml                       |   13 -
 www/ocsigen/patches/patch-src_extensions_rewritemod.ml                     |   13 -
 www/ocsigen/patches/patch-src_extensions_userconf.ml                       |   24 -
 www/ocsigen/patches/patch-src_http_Makefile                                |   15 -
 www/ocsigen/patches/patch-src_http_ocsigen__http__com.mli                  |   14 -
 www/ocsigen/patches/patch-src_server_ocsigen__extensions.ml                |  104 ----
 www/ocsigen/patches/patch-src_server_ocsigen__extensions.mli               |   72 --
 www/ocsigen/patches/patch-src_server_ocsigen__parseconfig.ml               |   51 -
 www/ocsigen/patches/patch-src_server_ocsigen__parseconfig.mli              |   48 -
 www/ocsigen/patches/patch-src_server_ocsigen__server.ml                    |   38 -
 28 files changed, 11 insertions(+), 1208 deletions(-)

diffs (truncated from 1353 to 300 lines):

diff -r b383f365fa6b -r 295035e6f942 www/ocsigen/Makefile
--- a/www/ocsigen/Makefile      Tue Jan 29 12:44:06 2019 +0000
+++ b/www/ocsigen/Makefile      Tue Jan 29 12:47:02 2019 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2018/11/29 10:54:14 jaapb Exp $
+# $NetBSD: Makefile,v 1.35 2019/01/29 12:47:02 jaapb Exp $
 #
 
-VERSION=       2.9
+VERSION=       2.11.0
 GITHUB_PROJECT=        ocsigenserver
 PKGNAME=       ocsigen-${VERSION}
-PKGREVISION=   4
 DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ocsigen/}
diff -r b383f365fa6b -r 295035e6f942 www/ocsigen/distinfo
--- a/www/ocsigen/distinfo      Tue Jan 29 12:44:06 2019 +0000
+++ b/www/ocsigen/distinfo      Tue Jan 29 12:47:02 2019 +0000
@@ -1,37 +1,10 @@
-$NetBSD: distinfo,v 1.12 2018/11/29 10:54:14 jaapb Exp $
+$NetBSD: distinfo,v 1.13 2019/01/29 12:47:02 jaapb Exp $
 
-SHA1 (ocsigenserver-2.9.tar.gz) = 1b4d50c9b6fff3ab78c8aef3ebbde1f8ddcc594e
-RMD160 (ocsigenserver-2.9.tar.gz) = f5114a7bda3327e279f57f40336a7c23e19b66ce
-SHA512 (ocsigenserver-2.9.tar.gz) = b3c5a86785feac18bac677ebb3736705f5d015a8692d2811bf22009dc319636e8b7bbb54dfd0223b2040a8f8bdef5ca3336d903b5ecd7eb260e8c0d48946ee46
-Size (ocsigenserver-2.9.tar.gz) = 1265175 bytes
+SHA1 (ocsigenserver-2.11.0.tar.gz) = 6c8e5c5bae9fe52e62ef3c7d7333c3196f191ede
+RMD160 (ocsigenserver-2.11.0.tar.gz) = c4d9380cd4f49ebab9e7abfb0ac2dec0881b6810
+SHA512 (ocsigenserver-2.11.0.tar.gz) = 18b9f4dff8214487dc3cd111c8ce2a06835ffec8062fae46ebafde97b1c3267f37f6b1c620d6c07320172c33a75568220c298cc96b789e907e72870a1ae7c70b
+Size (ocsigenserver-2.11.0.tar.gz) = 1265753 bytes
 SHA1 (patch-Makefile) = 637a45aacd7c8afaeb73be624eb7732b21e78b4d
-SHA1 (patch-Makefile.options) = 3e88ca4a0d04e01a4cb61e88aaec1b013ff0de5e
-SHA1 (patch-configure) = ed7a047081dfd233b95d4c25cb5832cb65bbcb11
 SHA1 (patch-src_baselib_Makefile) = e2fd5e5bd933d4ec844713c8f574efd5fa8426cf
-SHA1 (patch-src_baselib_ocsigen__stream.ml) = 6907fd8f7e0295f5147a0f2322cb1bec28f73953
-SHA1 (patch-src_extensions_Makefile) = 1dc200d1bd7a55424830acc5e79140e5e996c762
-SHA1 (patch-src_extensions_accesscontrol.ml) = a02101ea97747bb139f72413eb4f4a9ee738692e
-SHA1 (patch-src_extensions_accesscontrol.mli) = 19a67e7e43a9411616d8893d2886e4f048a107d8
-SHA1 (patch-src_extensions_authbasic.ml) = 8179c77352d52965d17c98d0ea3454cb3ff6e090
-SHA1 (patch-src_extensions_authbasic.mli) = 718c05392e48579a72b251a5966933b39bb7eff2
-SHA1 (patch-src_extensions_cgimod.ml) = ba572df1ab27f3e090bc1a1e032c1430113995ed
-SHA1 (patch-src_extensions_deflatemod.ml) = 16a4bb7a048930053120636f474297ff3c78d471
-SHA1 (patch-src_extensions_extendconfiguration.ml) = beb1a298427ea0d4c19326f29503eee7bd6b3dcb
-SHA1 (patch-src_extensions_extensiontemplate.ml) = 805bf033a8fc7a1ecd3532411b2defdb82eeaad4
-SHA1 (patch-src_extensions_ocsipersist-dbm_Makefile) = 2b73b0fa5594bc0542393e005d2979737a28d9bc
-SHA1 (patch-src_extensions_ocsipersist-dbm_ocsipersist.ml) = f747c7e54f23cf29fabbe972e6f5e43c952ce1d1
-SHA1 (patch-src_extensions_ocsipersist-pgsql_Makefile) = e3fa0e4691aa098826b93e67503a9116b28e5efb
-SHA1 (patch-src_extensions_ocsipersist-pgsql_ocsipersist.ml) = 3984d34c71965a2e0d02bf5da547b437911d7f38
-SHA1 (patch-src_extensions_ocsipersist-sqlite_Makefile) = 30bf60665d816ddb5cf1320ae5fdb51d7a50cb86
-SHA1 (patch-src_extensions_ocsipersist-sqlite_ocsipersist.ml) = 8a227e10de4fd5cec0f2f1b8b8aa88578d69056e
-SHA1 (patch-src_extensions_revproxy.ml) = e834ef862baed57310e3fe710905904298a3ac1d
-SHA1 (patch-src_extensions_rewritemod.ml) = cac9b8d6fa815bc2098de9eb5c6346c8d4a795f4
-SHA1 (patch-src_extensions_userconf.ml) = 8d62d77f760ee1027794698f88fc4e4da2de3eeb
-SHA1 (patch-src_http_Makefile) = 1bcfe69470fe53a8fc9b197fd95d21889646909d
-SHA1 (patch-src_http_ocsigen__http__com.mli) = f1760bf423e8aae763992e57c13408aa01c6316f
+SHA1 (patch-src_extensions_cgimod.ml) = 06630606179f07e1c9ffcec05e8e0f41cf73fc7c
 SHA1 (patch-src_server_Makefile) = 0f315fb0533d3d0b8f8cf1f3a61e11b013571b05
-SHA1 (patch-src_server_ocsigen__extensions.ml) = 7da60f1c1fc2c2370eac93829380cb108f40b2db
-SHA1 (patch-src_server_ocsigen__extensions.mli) = c2c426d96446292dd850b23b7feb9d93d1b5590a
-SHA1 (patch-src_server_ocsigen__parseconfig.ml) = b4a088c5cd3addb70dc4fa9a023878056fc9d1d1
-SHA1 (patch-src_server_ocsigen__parseconfig.mli) = 2b4b091a91efa1bf99e861c82d7d971845947bf9
-SHA1 (patch-src_server_ocsigen__server.ml) = 93c4dac4be34e68c65cf0814eb58954abcc31b1b
diff -r b383f365fa6b -r 295035e6f942 www/ocsigen/patches/patch-src_baselib_ocsigen__stream.ml
--- a/www/ocsigen/patches/patch-src_baselib_ocsigen__stream.ml  Tue Jan 29 12:44:06 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_baselib_ocsigen__stream.ml,v 1.1 2018/04/13 13:15:00 jaapb Exp $
-
-Lwt_chan no longer exists in Lwt 4, replaced by Lwt_io
---- src/baselib/ocsigen_stream.ml.orig 2018-02-01 12:55:17.000000000 +0000
-+++ src/baselib/ocsigen_stream.ml
-@@ -229,10 +229,10 @@ let of_file filename =
-   let fd = Lwt_unix.of_unix_file_descr
-       (Unix.openfile filename [Unix.O_RDONLY;Unix.O_NONBLOCK] 0o666)
-   in
--  let ch = Lwt_chan.in_channel_of_descr fd in
-+  let ch = Lwt_io.of_fd ~mode:Input fd in
-   let buf = Bytes.create 1024 in
-   let rec aux () =
--    Lwt_chan.input ch buf 0 1024 >>= fun n ->
-+    Lwt_io.read_into ch buf 0 1024 >>= fun n ->
-     if n = 0 then empty None else
-       (* Streams should be immutable, thus we always make a copy
-          of the buffer *)
diff -r b383f365fa6b -r 295035e6f942 www/ocsigen/patches/patch-src_extensions_Makefile
--- a/www/ocsigen/patches/patch-src_extensions_Makefile Tue Jan 29 12:44:06 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_extensions_Makefile,v 1.5 2018/11/29 10:54:14 jaapb Exp $
-
-The lwt_log package has been separated from lwt
-Replace tyxml.parser with xml-light (patch from upstream)
---- src/extensions/Makefile.orig       2018-02-01 12:55:17.000000000 +0000
-+++ src/extensions/Makefile
-@@ -8,7 +8,8 @@ PACKAGE  :=            \
-       lwt_react       \
-       netstring       \
-       netstring-pcre  \
--      tyxml.parser
-+      xml-light \
-+      lwt_log
- 
- LIBS     := -I ../baselib -I ../http -I ../server ${addprefix -package ,${PACKAGE}}
- OCAMLC   := $(OCAMLFIND) ocamlc ${BYTEDBG} ${THREAD}
diff -r b383f365fa6b -r 295035e6f942 www/ocsigen/patches/patch-src_extensions_accesscontrol.ml
--- a/www/ocsigen/patches/patch-src_extensions_accesscontrol.ml Tue Jan 29 12:44:06 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,259 +0,0 @@
-$NetBSD: patch-src_extensions_accesscontrol.ml,v 1.1 2018/11/29 10:54:14 jaapb Exp $
-
-Replace tyxml.parser with xml-light (patch from upstream)
---- src/extensions/accesscontrol.ml.orig       2018-02-01 12:55:17.000000000 +0000
-+++ src/extensions/accesscontrol.ml
-@@ -32,7 +32,6 @@ open Ocsigen_lib
- open Printf
- open Lwt
- open Ocsigen_extensions
--open Simplexmlparser
- open Ocsigen_http_frame
- 
- 
-@@ -43,7 +42,7 @@ let section = Lwt_log.Section.make "ocsi
- 
- let rec parse_condition = function
- 
--    | Element ("ip", ["value", s], []) ->
-+    | Xml.Element ("ip", ["value", s], []) ->
-         let prefix =
-           try
-             Ipaddr.Prefix.of_string_exn s
-@@ -67,9 +66,9 @@ let rec parse_condition = function
-                "IP: %a does not match %s"
-                (fun () -> Ocsigen_request_info.remote_ip) ri s;
-            r)
--    | Element ("ip" as s, _, _) -> badconfig "Bad syntax for tag %s" s
-+    | Xml.Element ("ip" as s, _, _) -> badconfig "Bad syntax for tag %s" s
- 
--    | Element ("port", ["value", s], []) ->
-+    | Xml.Element ("port", ["value", s], []) ->
-         let port =
-           try
-             int_of_string s
-@@ -87,9 +86,9 @@ let rec parse_condition = function
-                (fun () ri -> string_of_int (Ocsigen_request_info.server_port ri))
-                ri port;
-            r)
--    | Element ("port" as s, _, _) -> badconfig "Bad syntax for tag %s" s
-+    | Xml.Element ("port" as s, _, _) -> badconfig "Bad syntax for tag %s" s
- 
--    | Element ("ssl", [], []) ->
-+    | Xml.Element ("ssl", [], []) ->
-         (fun ri ->
-            let r = Ocsigen_request_info.ssl ri in
-            if r then
-@@ -97,9 +96,9 @@ let rec parse_condition = function
-            else
-              Lwt_log.ign_info ~section "SSL: not accepted";
-            r)
--    | Element ("ssl" as s, _, _) -> badconfig "Bad syntax for tag %s" s
-+    | Xml.Element ("ssl" as s, _, _) -> badconfig "Bad syntax for tag %s" s
- 
--    | Element ("header", ["name", name; "regexp", reg], []) ->
-+    | Xml.Element ("header", ["name", name; "regexp", reg], []) ->
-         let regexp =
-           try
-             Netstring_pcre.regexp ("^"^reg^"$")
-@@ -126,9 +125,9 @@ let rec parse_condition = function
-            if not r
-            then Lwt_log.ign_info_f "HEADER: header %s does not match %S" name reg;
-            r)
--    | Element ("header" as s, _, _) -> badconfig "Bad syntax for tag %s" s
-+    | Xml.Element ("header" as s, _, _) -> badconfig "Bad syntax for tag %s" s
- 
--    | Element ("method", ["value", s], []) ->
-+    | Xml.Element ("method", ["value", s], []) ->
-         let meth =
-           try
-             Framepp.method_of_string s
-@@ -146,9 +145,9 @@ let rec parse_condition = function
-                "METHOD: %a does not match %s"
-               (fun () ri -> Framepp.string_of_method (Ocsigen_request_info.meth ri)) ri s;
-            r)
--    | Element ("method" as s, _, _) -> badconfig "Bad syntax for tag %s" s
-+    | Xml.Element ("method" as s, _, _) -> badconfig "Bad syntax for tag %s" s
- 
--    | Element ("protocol", ["value", s], []) ->
-+    | Xml.Element ("protocol", ["value", s], []) ->
-         let pr =
-           try
-             Framepp.proto_of_string s
-@@ -166,9 +165,9 @@ let rec parse_condition = function
-                "PROTOCOL: %a does not match %s"
-                (fun () ri -> Framepp.string_of_proto (Ocsigen_request_info.protocol ri)) ri s;
-            r)
--    | Element ("protocol" as s, _, _) -> badconfig "Bad syntax for tag %s" s
-+    | Xml.Element ("protocol" as s, _, _) -> badconfig "Bad syntax for tag %s" s
- 
--    | Element ("path", ["regexp", s], []) ->
-+    | Xml.Element ("path", ["regexp", s], []) ->
-         let regexp =
-           try
-             Netstring_pcre.regexp ("^"^s^"$")
-@@ -189,22 +188,22 @@ let rec parse_condition = function
-                "PATH: \"%a\" does not match %S"
-                (fun () ri -> Ocsigen_request_info.sub_path_string ri) ri s;
-            r)
--    | Element ("path" as s, _, _) -> badconfig "Bad syntax for tag %s" s
-+    | Xml.Element ("path" as s, _, _) -> badconfig "Bad syntax for tag %s" s
- 
--    | Element ("and", [], sub) ->
-+    | Xml.Element ("and", [], sub) ->
-         let sub = List.map parse_condition sub in
-         (fun ri -> List.for_all (fun cond -> cond ri) sub)
--    | Element ("and" as s, _, _) -> badconfig "Bad syntax for tag %s" s
-+    | Xml.Element ("and" as s, _, _) -> badconfig "Bad syntax for tag %s" s
- 
--    | Element ("or", [], sub) ->
-+    | Xml.Element ("or", [], sub) ->
-         let sub = List.map parse_condition sub in
-         (fun ri -> List.exists (fun cond -> cond ri) sub)
--    | Element ("or" as s, _, _) -> badconfig "Bad syntax for tag %s" s
-+    | Xml.Element ("or" as s, _, _) -> badconfig "Bad syntax for tag %s" s
- 
--    | Element ("not", [], [sub]) ->
-+    | Xml.Element ("not", [], [sub]) ->
-         let sub = parse_condition sub in
-         (fun ri -> not (sub ri))
--    | Element ("not" as s, _, _) -> badconfig "Bad syntax for tag %s" s
-+    | Xml.Element ("not" as s, _, _) -> badconfig "Bad syntax for tag %s" s
- 
-     | _ ->
-         badconfig "Bad syntax for condition"
-@@ -217,17 +216,17 @@ let comma_space_regexp = Netstring_pcre.
- 
- let parse_config parse_fun = function
- 
--  | Element ("if", [], sub) ->
-+  | Xml.Element ("if", [], sub) ->
-       let (condition, sub) = match sub with
-         | cond::q -> (parse_condition cond, q)
-         | _ -> badconfig "Bad condition in <if>"
-       in
-       let (ithen, sub) = match sub with
--          | Element("then", [], ithen)::q -> (parse_fun ithen, q)
-+          | Xml.Element("then", [], ithen)::q -> (parse_fun ithen, q)
-           | _ -> badconfig "Bad <then> branch in <if>"
-       in
-       let (ielse, sub) = match sub with
--          | Element ("else", [], ielse)::([] as q) -> (parse_fun ielse, q)
-+          | Xml.Element ("else", [], ielse)::([] as q) -> (parse_fun ielse, q)
-           | [] -> (parse_fun [], [])
-           | _ -> badconfig "Bad <else> branch in <if>"
-       in
-@@ -243,17 +242,17 @@ let parse_config parse_fun = function
-                  Lwt_log.ign_info ~section "COND: going into <else> branch, if any";
-                  Ocsigen_extensions.Ext_sub_result ielse
-                end))
--  | Element ("if" as s, _, _) -> badconfig "Bad syntax for tag %s" s
-+  | Xml.Element ("if" as s, _, _) -> badconfig "Bad syntax for tag %s" s
- 
- 
--  | Element ("notfound", [], []) ->
-+  | Xml.Element ("notfound", [], []) ->
-       (fun rs ->
-         Lwt_log.ign_info ~section "NOT_FOUND: taking in charge 404";
-          Lwt.return (Ocsigen_extensions.Ext_stop_all
-                        (Ocsigen_cookies.Cookies.empty, 404)))
--  | Element ("notfound" as s, _, _) -> badconfig "Bad syntax for tag %s" s
-+  | Xml.Element ("notfound" as s, _, _) -> badconfig "Bad syntax for tag %s" s
- 
--  | Element ("nextsite", [], []) ->
-+  | Xml.Element ("nextsite", [], []) ->
-       (function
-          | Ocsigen_extensions.Req_found (_, r) ->
-              Lwt.return (Ocsigen_extensions.Ext_found_stop
-@@ -262,7 +261,7 @@ let parse_config parse_fun = function
-              Lwt.return (Ocsigen_extensions.Ext_stop_site
-                            (Ocsigen_cookies.Cookies.empty, 404)))
- 
--  | Element ("nexthost", [], []) ->
-+  | Xml.Element ("nexthost", [], []) ->
-       (function
-          | Ocsigen_extensions.Req_found (_, r) ->
-              Lwt.return (Ocsigen_extensions.Ext_found_stop
-@@ -270,9 +269,9 @@ let parse_config parse_fun = function
-          | Ocsigen_extensions.Req_not_found (err, ri) ->
-              Lwt.return (Ocsigen_extensions.Ext_stop_host
-                            (Ocsigen_cookies.Cookies.empty, 404)))
--  | Element ("nextsite" as s, _, _) -> badconfig "Bad syntax for tag %s" s
-+  | Xml.Element ("nextsite" as s, _, _) -> badconfig "Bad syntax for tag %s" s
- 
--  | Element ("stop", [], []) ->
-+  | Xml.Element ("stop", [], []) ->
-       (function
-          | Ocsigen_extensions.Req_found (_, r) ->
-              Lwt.return (Ocsigen_extensions.Ext_found_stop
-@@ -280,25 +279,25 @@ let parse_config parse_fun = function
-          | Ocsigen_extensions.Req_not_found (err, ri) ->
-              Lwt.return (Ocsigen_extensions.Ext_stop_all



Home | Main Index | Thread Index | Old Index