CVS commit: pkgsrc/www/ocsigen

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/www/ocsigen
From: "Jaap Boender" <jaapb%netbsd.org@localhost>
Date: Tue, 29 Jan 2019 12:47:03 +0000

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Tue Jan 29 12:47:03 UTC 2019

Modified Files:
        pkgsrc/www/ocsigen: Makefile distinfo
        pkgsrc/www/ocsigen/patches: patch-src_extensions_cgimod.ml
Removed Files:
        pkgsrc/www/ocsigen/patches: patch-src_baselib_ocsigen__stream.ml
            patch-src_extensions_Makefile patch-src_extensions_accesscontrol.ml
            patch-src_extensions_accesscontrol.mli
            patch-src_extensions_authbasic.ml
            patch-src_extensions_authbasic.mli
            patch-src_extensions_deflatemod.ml
            patch-src_extensions_extendconfiguration.ml
            patch-src_extensions_extensiontemplate.ml
            patch-src_extensions_ocsipersist-dbm_Makefile
            patch-src_extensions_ocsipersist-dbm_ocsipersist.ml
            patch-src_extensions_ocsipersist-pgsql_Makefile
            patch-src_extensions_ocsipersist-pgsql_ocsipersist.ml
            patch-src_extensions_ocsipersist-sqlite_Makefile
            patch-src_extensions_ocsipersist-sqlite_ocsipersist.ml
            patch-src_extensions_revproxy.ml patch-src_extensions_rewritemod.ml
            patch-src_extensions_userconf.ml patch-src_http_Makefile
            patch-src_http_ocsigen__http__com.mli
            patch-src_server_ocsigen__extensions.ml
            patch-src_server_ocsigen__extensions.mli
            patch-src_server_ocsigen__parseconfig.ml
            patch-src_server_ocsigen__parseconfig.mli
            patch-src_server_ocsigen__server.ml

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/www/ocsigen/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/ocsigen/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/www/ocsigen/patches/patch-src_baselib_ocsigen__stream.ml \
    pkgsrc/www/ocsigen/patches/patch-src_extensions_accesscontrol.ml \
    pkgsrc/www/ocsigen/patches/patch-src_extensions_accesscontrol.mli \
    pkgsrc/www/ocsigen/patches/patch-src_extensions_authbasic.ml \
    pkgsrc/www/ocsigen/patches/patch-src_extensions_authbasic.mli \
    pkgsrc/www/ocsigen/patches/patch-src_extensions_deflatemod.ml \
    pkgsrc/www/ocsigen/patches/patch-src_extensions_extendconfiguration.ml \
    pkgsrc/www/ocsigen/patches/patch-src_extensions_extensiontemplate.ml \
    pkgsrc/www/ocsigen/patches/patch-src_extensions_ocsipersist-dbm_Makefile \
    pkgsrc/www/ocsigen/patches/patch-src_extensions_ocsipersist-dbm_ocsipersist.ml \
    pkgsrc/www/ocsigen/patches/patch-src_extensions_ocsipersist-pgsql_ocsipersist.ml \
    pkgsrc/www/ocsigen/patches/patch-src_extensions_ocsipersist-sqlite_ocsipersist.ml \
    pkgsrc/www/ocsigen/patches/patch-src_extensions_revproxy.ml \
    pkgsrc/www/ocsigen/patches/patch-src_extensions_rewritemod.ml \
    pkgsrc/www/ocsigen/patches/patch-src_extensions_userconf.ml \
    pkgsrc/www/ocsigen/patches/patch-src_http_ocsigen__http__com.mli \
    pkgsrc/www/ocsigen/patches/patch-src_server_ocsigen__extensions.ml \
    pkgsrc/www/ocsigen/patches/patch-src_server_ocsigen__extensions.mli \
    pkgsrc/www/ocsigen/patches/patch-src_server_ocsigen__parseconfig.ml \
    pkgsrc/www/ocsigen/patches/patch-src_server_ocsigen__parseconfig.mli
cvs rdiff -u -r1.5 -r0 \
    pkgsrc/www/ocsigen/patches/patch-src_extensions_Makefile
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/www/ocsigen/patches/patch-src_extensions_cgimod.ml
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/www/ocsigen/patches/patch-src_extensions_ocsipersist-pgsql_Makefile
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/www/ocsigen/patches/patch-src_extensions_ocsipersist-sqlite_Makefile \
    pkgsrc/www/ocsigen/patches/patch-src_server_ocsigen__server.ml
cvs rdiff -u -r1.4 -r0 pkgsrc/www/ocsigen/patches/patch-src_http_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/ocsigen/Makefile
diff -u pkgsrc/www/ocsigen/Makefile:1.34 pkgsrc/www/ocsigen/Makefile:1.35
--- pkgsrc/www/ocsigen/Makefile:1.34    Thu Nov 29 10:54:14 2018
+++ pkgsrc/www/ocsigen/Makefile Tue Jan 29 12:47:02 2019
@@ -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/}

Index: pkgsrc/www/ocsigen/distinfo
diff -u pkgsrc/www/ocsigen/distinfo:1.12 pkgsrc/www/ocsigen/distinfo:1.13
--- pkgsrc/www/ocsigen/distinfo:1.12    Thu Nov 29 10:54:14 2018
+++ pkgsrc/www/ocsigen/distinfo Tue Jan 29 12:47:02 2019
@@ -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

Index: pkgsrc/www/ocsigen/patches/patch-src_extensions_cgimod.ml
diff -u pkgsrc/www/ocsigen/patches/patch-src_extensions_cgimod.ml:1.2 pkgsrc/www/ocsigen/patches/patch-src_extensions_cgimod.ml:1.3
--- pkgsrc/www/ocsigen/patches/patch-src_extensions_cgimod.ml:1.2       Thu Nov 29 10:54:14 2018
+++ pkgsrc/www/ocsigen/patches/patch-src_extensions_cgimod.ml   Tue Jan 29 12:47:02 2019
@@ -1,82 +1,14 @@
-$NetBSD: patch-src_extensions_cgimod.ml,v 1.2 2018/11/29 10:54:14 jaapb Exp $
+$NetBSD: patch-src_extensions_cgimod.ml,v 1.3 2019/01/29 12:47:02 jaapb Exp $
 
 Write correct request URI
-Lwt_chan no longer exists in Lwt 4, replaced by Lwt_io
-Replace tyxml.parser with xml-light (patch from upstream)
---- src/extensions/cgimod.ml.orig      2018-02-01 12:55:17.000000000 +0000
+--- src/extensions/cgimod.ml.orig      2018-12-19 10:54:19.000000000 +0000
 +++ src/extensions/cgimod.ml
-@@ -28,7 +28,6 @@ open Ocsigen_lib
- 
- open Lwt
- open Ocsigen_extensions
--open Simplexmlparser
- open Ocsigen_http_frame
- open Ocsigen_http_com
- open Ocsigen_senders
-@@ -271,7 +270,8 @@ let array_environment filename re doc_ro
+@@ -270,7 +270,7 @@ let array_environment filename re doc_ro
  
          (* Neither in the CGI's spec nor in the HTTP headers but used, e.g., by PHP *)
          Printf.sprintf "REMOTE_PORT=%d" (Ocsigen_request_info.remote_port ri);
 -        Printf.sprintf "REQUEST_URI=%s" (Ocsigen_request_info.url_string ri);
 +        Printf.sprintf "REQUEST_URI=%s" (string_conform0 (Ocsigen_request_info.url_string ri));
-+
          (* FIXME: URI instead of URL ? *)
          Printf.sprintf "SCRIPT_FILENAME=%s" filename ] ;
        additionnal_headers
-@@ -368,7 +368,7 @@ let recupere_cgi head re doc_root filena
-     Lwt_timeout.start timeout;
- 
-     (* A thread giving POST data to the CGI script: *)
--    let post_in_ch = Lwt_chan.out_channel_of_descr post_in in
-+    let post_in_ch = Lwt_io.of_fd ~mode:Output post_in in
-     ignore
-       (catch
-          (fun () ->
-@@ -376,7 +376,7 @@ let recupere_cgi head re doc_root filena
-              | None -> Lwt_unix.close post_in
-              | Some content_post ->
-                Ocsigen_http_com.write_stream post_in_ch content_post >>= fun () ->
--               Lwt_chan.flush post_in_ch >>= fun () ->
-+               Lwt_io.flush post_in_ch >>= fun () ->
-                Lwt_unix.close post_in
-             ))
-          (*XXX Check possible errors! *)
-@@ -391,9 +391,9 @@ let recupere_cgi head re doc_root filena
- 
-     (* A thread listening the error output of the CGI script
-        and writing them in warnings.log *)
--    let err_channel = Lwt_chan.in_channel_of_descr err_out in
-+    let err_channel = Lwt_io.of_fd ~mode:Input err_out in
-     let rec get_errors () =
--      Lwt_chan.input_line err_channel >>= fun err ->
-+      Lwt_io.read_line err_channel >>= fun err ->
-       Lwt_log.ign_warning ~section err;
-       get_errors ()
-     in ignore
-@@ -456,7 +456,7 @@ let get_content str =
- (*****************************************************************************)
- let rec parse_global_config = function
-   | [] -> ()
--  | (Element ("cgitimeout", [("value", s)], []))::[] ->
-+  | (Xml.Element ("cgitimeout", [("value", s)], []))::[] ->
-     cgitimeout := int_of_string s
-   | _ -> raise (Error_in_config_file
-                   ("Unexpected content inside cgimod config"))
-@@ -573,7 +573,7 @@ let gen reg = function
- 
- let rec set_env = function
-   | [] -> []
--  | (Element("setenv", [("var",vr);("val",vl)], []))::l ->
-+  | (Xml.Element("setenv", [("var",vr);("val",vl)], []))::l ->
-     if List.mem vr environment
-     then (Lwt_log.ign_info_f ~section "Variable no set %s" vr;
-           set_env l)
-@@ -581,7 +581,7 @@ let rec set_env = function
-   | _ :: l -> raise (Error_in_config_file "Bad config tag for <cgi>")
- 
- let parse_config _ path _ _ = function
--  | Element ("cgi", atts, l) ->
-+  | Xml.Element ("cgi", atts, l) ->
-     let good_root r =
-       Regexp.quote (string_conform2 r)
-     in

Prev by Date: CVS commit: [pkgsrc-2018Q4] pkgsrc/www/drupal7
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: [pkgsrc-2018Q4] pkgsrc/www/drupal7
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index