ping On 18 February 2017 at 14:33, David CARLIER <devne...@gmail.com> wrote:
> ping :-) > > On 9 February 2017 at 20:31, David CARLIER <devne...@gmail.com> wrote: > >> Thanks for your inputs. Here a new version. Regards. >> >> On 9 February 2017 at 17:35, Stuart Henderson <s...@spacehopper.org> >> wrote: >> >>> On 2017/02/09 16:04, David CARLIER wrote: >>> > ping :-) >>> > >>> > On 27 January 2017 at 22:57, David CARLIER <devne...@gmail.com> wrote: >>> > >>> > > Hi all, >>> > > >>> > > This is an early draft of a possible import of h2o into the tree. >>> > > >>> > > Let me know what you think. >>> > > >>> > > Thanks. >>> > > >>> >>> On 2017/01/27 22:57, David CARLIER wrote: >>> > diff --git a/www/h2o/Makefile b/www/h2o/Makefile >>> >>> tar.gz for ports submissions please. >>> >>> > new file mode 100644 >>> > index 0000000..df7a730 >>> > --- /dev/null >>> > +++ b/www/h2o/Makefile >>> > @@ -0,0 +1,35 @@ >>> > +# $OpenBSD $ >>> > + >>> > +COMMENT = Web server library >>> >>> lowercase first char. could do with being more descriptive. it's not >>> just a library. >>> >>> > +DISTNAME = v${V} >>> > +PKGNAME = h2o-${V} >>> > +V = 2.1.0 >>> .. >>> > +MASTER_SITES = https://github.com/h2o/h2o/archive/ >>> .. >>> > +WRKDIST = ${WRKDIR}/${PKGNAME} >>> >>> replace all the above with >>> >>> GH_ACCOUNT= h2o >>> GH_PROJECT= h2o >>> GH_TAGNAME= v2.1.0 >>> >>> and regenerate distinfo >>> >>> > + >>> > +SHARED_LIBS = h2o-evloop 0.0 >>> > + >>> > +CATEGORIES = www >>> > + >>> > +HOMEPAGE = http://h2o.examp1e.net >>> >>> immediately redirects to https://h2o.examp1e.net/, so better to use >>> that. >>> >>> > + >>> > +PERMIT_PACKAGE_CDROM = Yes >>> > + >>> > +MODULES = devel/cmake gcc4 >>> > +MODGCC4_LANGS = c c++ >>> > +MODGCC4_ARCHS = * >>> > + >>> > +CONFIGURE_ARGS = -DWITH_BUNDLED_SSL=OFF \ >>> > + -DBUILD_SHARED_LIBS=ON \ >>> > + -DWITH_MRUBY=OFF \ >>> > + -DCMAKE_INSTALL_SYSCONFDIR=/etc/h2o >>> > + >>> > +NO_TEST = No >>> > + >>> > +post-install: >>> > + @mkdir /etc/h2o >>> > + ${INSTALL_DATA} ${FILESDIR}/h2o.conf /etc/h2o >>> >>> during packaging, install the files to ${PREFIX}/share/examples/h2o. >>> >>> in plist, do this >>> >>> share/examples/h2o/ >>> @sample ${SYSCONFDIR}/h2o/ >>> share/examples/h2o/h2o.conf >>> @sample ${SYSCONFDIR}/h2o/h2o.conf >>> >>> > diff --git a/www/h2o/files/h2o.conf b/www/h2o/files/h2o.conf >>> > new file mode 100644 >>> > index 0000000..f57cd33 >>> > --- /dev/null >>> > +++ b/www/h2o/files/h2o.conf >>> > @@ -0,0 +1,7 @@ >>> > +listen: 8080 >>> > +hosts: >>> > + "127.0.0.1:8080": >>> > + paths: >>> > + /: >>> > + file.dir: /var/www/htdocs >>> > + access-log: /var/log/h2o-access.log >>> >>> probably better to use something in /var/www/logs/ - >>> maybe just use the existing /var/www/logs/access.log? >>> >>> > diff --git a/www/h2o/pkg/DESCR b/www/h2o/pkg/DESCR >>> > new file mode 100644 >>> > index 0000000..2b22290 >>> > --- /dev/null >>> > +++ b/www/h2o/pkg/DESCR >>> > @@ -0,0 +1 @@ >>> > +H2o is an optimized HTTP server with support for HTTP/1.x and HTTP/2 >>> >>> could do with a bit more description here. >>> could use "optimized HTTP server with support for HTTP/1.x and HTTP/2" >>> as COMMENT.. >>> >>> > diff --git a/www/h2o/pkg/PLIST b/www/h2o/pkg/PLIST >>> > new file mode 100644 >>> > index 0000000..984f0d5 >>> > --- /dev/null >>> > +++ b/www/h2o/pkg/PLIST >>> > @@ -0,0 +1,115 @@ >>> > +@comment $OpenBSD$ >>> > +@bin bin/h2o >>> > +@mode 700 >>> > +@owner www >>> > +@group www >>> > +include/h2o/ >>> > +include/h2o.h >>> > +include/h2o/cache.h >>> <..> >>> >>> these @mode/@owner/@group are wrong. www should never be able to write to >>> these sorts of file. >>> >>> > +include/h2o/cache_digests.h >>> > +include/h2o/configurator.h >>> > +include/h2o/file.h >>> > +include/h2o/filecache.h >>> > +include/h2o/hostinfo.h >>> > +include/h2o/http1.h >>> > +include/h2o/http1client.h >>> > +include/h2o/http2.h >>> > +include/h2o/http2_casper.h >>> > +include/h2o/http2_internal.h >>> > +include/h2o/http2_scheduler.h >>> > +include/h2o/linklist.h >>> > +include/h2o/memcached.h >>> > +include/h2o/memory.h >>> > +include/h2o/mruby_.h >>> > +include/h2o/multithread.h >>> > +include/h2o/openssl_backport.h >>> > +include/h2o/rand.h >>> > +include/h2o/serverutil.h >>> > +include/h2o/socket/ >>> > +include/h2o/socket.h >>> > +include/h2o/socket/evloop.h >>> > +include/h2o/socket/uv-binding.h >>> > +include/h2o/socketpool.h >>> > +include/h2o/string_.h >>> > +include/h2o/time_.h >>> > +include/h2o/timeout.h >>> > +include/h2o/token.h >>> > +include/h2o/tunnel.h >>> > +include/h2o/url.h >>> > +include/h2o/version.h >>> > +include/h2o/websocket.h >>> > +@lib lib/libh2o-evloop.so.${LIBh2o-evloop_VERSION} >>> > +lib/pkgconfig/libh2o-evloop.pc >>> > +share/doc/h2o/ >>> > +share/doc/h2o/assets/ >>> > +share/doc/h2o/assets/8mbps100msec-nginx195-h2o150.png >>> > +share/doc/h2o/assets/firstpaintbench.png >>> > +share/doc/h2o/assets/remotebench.png >>> > +share/doc/h2o/assets/searchstyle.css >>> > +share/doc/h2o/assets/staticfile612-nginx1910-h2o170.png >>> > +share/doc/h2o/assets/style.css >>> > +share/doc/h2o/benchmarks.html >>> > +share/doc/h2o/configure/ >>> > +share/doc/h2o/configure.html >>> > +share/doc/h2o/configure/access_control.html >>> > +share/doc/h2o/configure/access_log_directives.html >>> > +share/doc/h2o/configure/base_directives.html >>> > +share/doc/h2o/configure/basic_auth.html >>> > +share/doc/h2o/configure/cgi.html >>> > +share/doc/h2o/configure/command_options.html >>> > +share/doc/h2o/configure/compress_directives.html >>> > +share/doc/h2o/configure/dos_detection.html >>> > +share/doc/h2o/configure/errordoc_directives.html >>> > +share/doc/h2o/configure/expires_directives.html >>> > +share/doc/h2o/configure/fastcgi_directives.html >>> > +share/doc/h2o/configure/file_directives.html >>> > +share/doc/h2o/configure/headers_directives.html >>> > +share/doc/h2o/configure/http1_directives.html >>> > +share/doc/h2o/configure/http2_directives.html >>> > +share/doc/h2o/configure/mruby.html >>> > +share/doc/h2o/configure/mruby_directives.html >>> > +share/doc/h2o/configure/proxy_directives.html >>> > +share/doc/h2o/configure/quick_start.html >>> > +share/doc/h2o/configure/redirect_directives.html >>> > +share/doc/h2o/configure/reproxy_directives.html >>> > +share/doc/h2o/configure/status_directives.html >>> > +share/doc/h2o/configure/syntax_and_structure.html >>> > +share/doc/h2o/configure/throttle_response_directives.html >>> > +share/doc/h2o/examples/ >>> > +share/doc/h2o/examples/doc_root/ >>> > +share/doc/h2o/examples/doc_root.alternate/ >>> > +share/doc/h2o/examples/doc_root.alternate/index.txt >>> > +share/doc/h2o/examples/doc_root/index.html >>> > +share/doc/h2o/examples/h2o/ >>> > +share/doc/h2o/examples/h2o/alternate.crt >>> > +share/doc/h2o/examples/h2o/alternate.key >>> > +share/doc/h2o/examples/h2o/h2o.conf >>> > +share/doc/h2o/examples/h2o/server.crt >>> > +share/doc/h2o/examples/h2o/server.key >>> > +share/doc/h2o/examples/h2o_mruby/ >>> > +share/doc/h2o/examples/h2o_mruby/h2o.conf >>> > +share/doc/h2o/examples/h2o_mruby/hello.rb >>> > +share/doc/h2o/examples/libh2o/ >>> > +share/doc/h2o/examples/libh2o/http1client.c >>> > +share/doc/h2o/examples/libh2o/latency-optimization.c >>> > +share/doc/h2o/examples/libh2o/simple.c >>> > +share/doc/h2o/examples/libh2o/socket-client.c >>> > +share/doc/h2o/examples/libh2o/websocket.c >>> > +share/doc/h2o/faq.html >>> > +share/doc/h2o/index.html >>> > +share/doc/h2o/install.html >>> > +share/doc/h2o/search/ >>> > +share/doc/h2o/search/jquery-1.9.1.min.js >>> > +share/doc/h2o/search/oktavia-english-search.js >>> > +share/doc/h2o/search/oktavia-jquery-ui.js >>> > +share/doc/h2o/search/searchindex.js >>> > +share/h2o/ >>> > +share/h2o/annotate-backtrace-symbols >>> > +share/h2o/ca-bundle.crt >>> > +share/h2o/fastcgi-cgi >>> > +share/h2o/fetch-ocsp-response >>> > +share/h2o/kill-on-close >>> > +share/h2o/setuidgid >>> > +share/h2o/start_server >>> > +share/h2o/status/ >>> > +share/h2o/status/index.html >>> >>> >>> >> >