Re: [PATCH] lang/njs: update to 0.8.2
On Thu, Oct 26, 2023 at 04:38:01PM +0200, Landry Breuil wrote: [...] > > > that doesnt happen when building the nginx njs module which uses > > > '-I /usr/local/include/libxml2 -I /usr/local/include -Isrc -Ibuild -Injs' > > > > > > would be nice :) > > > > I attached a small patch from the lang/njs/patches directory, > > that works for me. So, REVISION for the lang/njs/Makefile needs > > to be bumped to `0'. > > yep, perfect - 0.8.2 now builds while 0.8.1 is installed.. also commited ! Thanks, Landry! I'm going to submit the patch to the upstream. -- Sergey A. Osokin
Re: [PATCH] lang/njs: update to 0.8.2
On Thu, Oct 26, 2023 at 03:53:07PM +0200, Landry Breuil wrote: [...] > > asking for the second or third time.. would it be possible to fix > upstream so that it can build itself if the previous version is > installed ? I'm working on that. > otherwise it still fails: > > src/njs_flathsh.c:166:1: error: no previous prototype for function > 'njs_flathsh_destroy' [-Werror,-Wmissing-prototypes] > njs_flathsh_destroy(njs_flathsh_t *fh, njs_flathsh_query_t *fhq) > > just because the order of includes is wrong.. '-I/usr/local/include -Isrc > -Ibuild -I/usr/local/include/libxml2 -I/usr/local/include' > > that doesnt happen when building the nginx njs module which uses '-I > /usr/local/include/libxml2 -I /usr/local/include -Isrc -Ibuild -Injs' > > would be nice :) I attached a small patch from the lang/njs/patches directory, that works for me. So, REVISION for the lang/njs/Makefile needs to be bumped to `0'. > commited, thanks! Thank you! -- Sergey A. Osokin Index: auto/make --- auto/make.orig +++ auto/make @@ -85,8 +85,9 @@ do cat << END >> $NJS_MAKEFILE $NJS_BUILD_DIR/$njs_obj: $njs_src - \$(NJS_CC) -c \$(NJS_CFLAGS) $NJS_LIB_AUX_CFLAGS \\ + \$(NJS_CC) -c \$(NJS_CFLAGS) \\ \$(NJS_LIB_INCS) -Injs \\ + $NJS_LIB_AUX_CFLAGS \\ -o $NJS_BUILD_DIR/$njs_obj \\ $njs_dep_flags \\ $njs_src
Re: [PATCH] lang/njs: update to 0.8.2
Hi Landry,
On Thu, Oct 26, 2023 at 08:51:19AM +0200, Landry Breuil wrote:
> Le Wed, Oct 25, 2023 at 04:47:39PM +0000, Sergey A. Osokin a écrit :
> > Hi,
> >
> > here's the patch to update lang/njs to the recent version, 0.8.2.
> > Also, the patch provides an update for njs module for www/nginx.
>
> that patch only updates the version in nginx afaict..
here we go.
--
Sergey A. Osokin
Index: lang/njs/Makefile
===
RCS file: /cvs/ports/lang/njs/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- lang/njs/Makefile 18 Sep 2023 13:08:53 - 1.5
+++ lang/njs/Makefile 26 Oct 2023 13:34:48 -
@@ -2,9 +2,7 @@ COMMENT= NGINX JavaScript command line u
GH_ACCOUNT= nginx
GH_PROJECT= njs
-GH_TAGNAME= 0.8.1
-
-REVISION= 0
+GH_TAGNAME= 0.8.2
CATEGORIES= lang www
Index: lang/njs/distinfo
===
RCS file: /cvs/ports/lang/njs/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- lang/njs/distinfo 17 Sep 2023 06:57:46 - 1.3
+++ lang/njs/distinfo 26 Oct 2023 13:34:48 -
@@ -1,2 +1,2 @@
-SHA256 (njs-0.8.1.tar.gz) = BFDZZS08/n3Z+ALW95CjYW4WEu70Rxlc09ql1Ds5WIE=
-SIZE (njs-0.8.1.tar.gz) = 729780
+SHA256 (njs-0.8.2.tar.gz) = bxc4fbjfkLbjOC0oBFWWL/hforGjLZHCzh/Rr1qFTXI=
+SIZE (njs-0.8.2.tar.gz) = 733916
Index: www/nginx/Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.174
diff -u -p -r1.174 Makefile
--- www/nginx/Makefile 5 Oct 2023 09:55:47 - 1.174
+++ www/nginx/Makefile 26 Oct 2023 13:34:56 -
@@ -22,7 +22,7 @@ VERSION= 1.24.0
DISTNAME= nginx-${VERSION}
CATEGORIES= www
-VERSION-njs= 0.8.1
+VERSION-njs= 0.8.2
VERSION-rtmp= 1.2.1
PKGNAME-main= ${DISTNAME}
@@ -43,7 +43,7 @@ PKGNAME-securelink= nginx-securelink-${V
REVISION-main= 0
REVISION-passenger= 1
-REVISION-njs= 0
+REVISION-njs= 1
REVISION-lua= 0
ONLY_FOR_ARCHS-passenger= aarch64 amd64 arm i386
Index: www/nginx/distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.82
diff -u -p -r1.82 distinfo
--- www/nginx/distinfo 17 Sep 2023 06:59:25 - 1.82
+++ www/nginx/distinfo 26 Oct 2023 13:34:56 -
@@ -8,7 +8,7 @@ SHA256 (nginx-rtmp-module-v1.2.1.tar.gz)
SHA256 (ngx_devel_kit-v0.3.0.tar.gz) = iOBamainQZBm9a51lm+x78QJutRSLRSYbaB0VUrmFhk=
SHA256 (ngx_http_geoip2_module-3.3.tar.gz) = QTeEOMgz4xOhiGnQxKcnBLSDXDCsr3/WgBOrZzL/eKc=
SHA256 (ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz) = ZXpA2rODS1enIREzlD1OqWwpWcv3NOUXH4eUOgOAmqg=
-SHA256 (njs-0.8.1.tar.gz) = BFDZZS08/n3Z+ALW95CjYW4WEu70Rxlc09ql1Ds5WIE=
+SHA256 (njs-0.8.2.tar.gz) = bxc4fbjfkLbjOC0oBFWWL/hforGjLZHCzh/Rr1qFTXI=
SIZE (headers-more-nginx-module-v0.34.tar.gz) = 28827
SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
SIZE (naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834.tar.gz) = 237272
@@ -19,4 +19,4 @@ SIZE (nginx-rtmp-module-v1.2.1.tar.gz) =
SIZE (ngx_devel_kit-v0.3.0.tar.gz) = 66455
SIZE (ngx_http_geoip2_module-3.3.tar.gz) = 8509
SIZE (ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz) = 6159
-SIZE (njs-0.8.1.tar.gz) = 729780
+SIZE (njs-0.8.2.tar.gz) = 733916
[PATCH] lang/njs: update to 0.8.2
Hi,
here's the patch to update lang/njs to the recent version, 0.8.2.
Also, the patch provides an update for njs module for www/nginx.
Thank you.
--
Sergey A. Osokin
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.174
diff -u -p -r1.174 Makefile
--- Makefile 5 Oct 2023 09:55:47 - 1.174
+++ Makefile 25 Oct 2023 16:44:26 -
@@ -22,7 +22,7 @@ VERSION= 1.24.0
DISTNAME= nginx-${VERSION}
CATEGORIES= www
-VERSION-njs= 0.8.1
+VERSION-njs= 0.8.2
VERSION-rtmp= 1.2.1
PKGNAME-main= ${DISTNAME}
@@ -43,7 +43,7 @@ PKGNAME-securelink= nginx-securelink-${V
REVISION-main= 0
REVISION-passenger= 1
-REVISION-njs= 0
+REVISION-njs= 1
REVISION-lua= 0
ONLY_FOR_ARCHS-passenger= aarch64 amd64 arm i386
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.82
diff -u -p -r1.82 distinfo
--- distinfo 17 Sep 2023 06:59:25 - 1.82
+++ distinfo 25 Oct 2023 16:44:26 -
@@ -8,7 +8,7 @@ SHA256 (nginx-rtmp-module-v1.2.1.tar.gz)
SHA256 (ngx_devel_kit-v0.3.0.tar.gz) = iOBamainQZBm9a51lm+x78QJutRSLRSYbaB0VUrmFhk=
SHA256 (ngx_http_geoip2_module-3.3.tar.gz) = QTeEOMgz4xOhiGnQxKcnBLSDXDCsr3/WgBOrZzL/eKc=
SHA256 (ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz) = ZXpA2rODS1enIREzlD1OqWwpWcv3NOUXH4eUOgOAmqg=
-SHA256 (njs-0.8.1.tar.gz) = BFDZZS08/n3Z+ALW95CjYW4WEu70Rxlc09ql1Ds5WIE=
+SHA256 (njs-0.8.2.tar.gz) = bxc4fbjfkLbjOC0oBFWWL/hforGjLZHCzh/Rr1qFTXI=
SIZE (headers-more-nginx-module-v0.34.tar.gz) = 28827
SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
SIZE (naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834.tar.gz) = 237272
@@ -19,4 +19,4 @@ SIZE (nginx-rtmp-module-v1.2.1.tar.gz) =
SIZE (ngx_devel_kit-v0.3.0.tar.gz) = 66455
SIZE (ngx_http_geoip2_module-3.3.tar.gz) = 8509
SIZE (ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz) = 6159
-SIZE (njs-0.8.1.tar.gz) = 729780
+SIZE (njs-0.8.2.tar.gz) = 733916
[PATCH] www/unit: maintainer update to 1.31.1
Hi,
here's the patch to update www/unit for the recent version - 1.31.1.
Could you please review and commit the patch.
Thank you.
--
Sergey A. Osokin
Index: Makefile.inc
===
RCS file: /cvs/ports/www/unit/Makefile.inc,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile.inc
--- Makefile.inc 27 Sep 2023 19:13:06 - 1.11
+++ Makefile.inc 22 Oct 2023 00:46:54 -
@@ -1,4 +1,4 @@
-VERSION?= 1.31.0
+VERSION?= 1.31.1
DISTNAME= unit-${VERSION}
CATEGORIES= www
Index: unit/Makefile
===
RCS file: /cvs/ports/www/unit/unit/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- unit/Makefile 8 Sep 2023 05:40:28 - 1.7
+++ unit/Makefile 22 Oct 2023 00:46:54 -
@@ -1,7 +1,5 @@
COMMENT= dynamic web application server
-REVISION= 0
-
WANTLIB= c crypto m pcre2-8 pthread ssl xml2 z
LIB_DEPENDS= devel/pcre2
Index: unit/distinfo
===
RCS file: /cvs/ports/www/unit/unit/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- unit/distinfo 5 Sep 2023 11:31:17 - 1.7
+++ unit/distinfo 22 Oct 2023 00:46:54 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.31.0.tar.gz) = JosYALxOAwZn5nln0FKBdDff8D94CsCphZCaoiXeYe0=
-SIZE (unit-1.31.0.tar.gz) = 905152
+SHA256 (unit-1.31.1.tar.gz) = nfYE1Jy1esAQMgLvsPk3Pj5Ip92IjJSvENT5bM3tfXE=
+SIZE (unit-1.31.1.tar.gz) = 907165
Index: unit-perl/distinfo
===
RCS file: /cvs/ports/www/unit/unit-perl/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- unit-perl/distinfo 5 Sep 2023 11:31:17 - 1.7
+++ unit-perl/distinfo 22 Oct 2023 00:46:54 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.31.0.tar.gz) = JosYALxOAwZn5nln0FKBdDff8D94CsCphZCaoiXeYe0=
-SIZE (unit-1.31.0.tar.gz) = 905152
+SHA256 (unit-1.31.1.tar.gz) = nfYE1Jy1esAQMgLvsPk3Pj5Ip92IjJSvENT5bM3tfXE=
+SIZE (unit-1.31.1.tar.gz) = 907165
Index: unit-php/distinfo
===
RCS file: /cvs/ports/www/unit/unit-php/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- unit-php/distinfo 5 Sep 2023 11:31:17 - 1.7
+++ unit-php/distinfo 22 Oct 2023 00:46:54 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.31.0.tar.gz) = JosYALxOAwZn5nln0FKBdDff8D94CsCphZCaoiXeYe0=
-SIZE (unit-1.31.0.tar.gz) = 905152
+SHA256 (unit-1.31.1.tar.gz) = nfYE1Jy1esAQMgLvsPk3Pj5Ip92IjJSvENT5bM3tfXE=
+SIZE (unit-1.31.1.tar.gz) = 907165
Index: unit-python/distinfo
===
RCS file: /cvs/ports/www/unit/unit-python/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- unit-python/distinfo 5 Sep 2023 11:31:17 - 1.7
+++ unit-python/distinfo 22 Oct 2023 00:46:54 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.31.0.tar.gz) = JosYALxOAwZn5nln0FKBdDff8D94CsCphZCaoiXeYe0=
-SIZE (unit-1.31.0.tar.gz) = 905152
+SHA256 (unit-1.31.1.tar.gz) = nfYE1Jy1esAQMgLvsPk3Pj5Ip92IjJSvENT5bM3tfXE=
+SIZE (unit-1.31.1.tar.gz) = 907165
Index: unit-ruby/distinfo
===
RCS file: /cvs/ports/www/unit/unit-ruby/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- unit-ruby/distinfo 5 Sep 2023 11:31:17 - 1.7
+++ unit-ruby/distinfo 22 Oct 2023 00:46:54 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.31.0.tar.gz) = JosYALxOAwZn5nln0FKBdDff8D94CsCphZCaoiXeYe0=
-SIZE (unit-1.31.0.tar.gz) = 905152
+SHA256 (unit-1.31.1.tar.gz) = nfYE1Jy1esAQMgLvsPk3Pj5Ip92IjJSvENT5bM3tfXE=
+SIZE (unit-1.31.1.tar.gz) = 907165
Re: CVS: cvs.openbsd.org: ports
On Thu, Sep 07, 2023 at 11:40:28PM -0600, Landry Breuil wrote: > CVSROOT: /cvs > Module name: ports > Changes by: lan...@cvs.openbsd.org 2023/09/07 23:40:28 > > Modified files: > www/unit : Makefile.inc > www/unit/unit : Makefile > > Log message: > www/unit: enable njs support > > >From MAINTAINER Sergey A Osokin Thank you, Landry! -- Sergey A. Osokin
Re: [PATCH] www/unit: enable njs
On Thu, Sep 07, 2023 at 05:08:11PM +0200, Landry Breuil wrote:
> Le Thu, Sep 07, 2023 at 02:47:58PM +0000, Sergey A. Osokin a écrit :
> >
> > There's no shared library for NJS at the moment, only static
> > library is available.
>
> right. then ... i think BUILD_DEPENDS + RUN_DEPENDS is needed in the
> static case instead.
>
> you might want to check WANTLIB too (make port-lib-depends-check), here
> it complains about missing xml2/z
Done.
A note here. The /usr/ports/infrastructure/bin/portcheck reports about
xml2, that shared library is required for NJS functionality, it's
mentioned in NJS pkgconfig file, /usr/local/lib/pkgconfig/njs.pc, so I
added it to WANTLIB. Hope that's OK.
--
Sergey A. Osokin
Index: Makefile.inc
===
RCS file: /cvs/ports/www/unit/Makefile.inc,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile.inc
--- Makefile.inc 5 Sep 2023 11:31:17 - 1.9
+++ Makefile.inc 7 Sep 2023 15:29:22 -
@@ -27,6 +27,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \
--pid=${LOCALSTATEDIR}/run/unit/unit.pid \
--runstatedir=${LOCALSTATEDIR}/run/unit \
--statedir=${LOCALSTATEDIR}/db/unit \
+ --njs \
--tmpdir=${LOCALSTATEDIR}/tmp/unit \
--openssl \
--user=_unit \
Index: unit/Makefile
===
RCS file: /cvs/ports/www/unit/unit/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- unit/Makefile 4 Sep 2023 17:02:21 - 1.6
+++ unit/Makefile 7 Sep 2023 15:29:22 -
@@ -1,8 +1,12 @@
COMMENT= dynamic web application server
-WANTLIB= c crypto m pcre2-8 pthread ssl
+REVISION= 0
+
+WANTLIB= c crypto m pcre2-8 pthread ssl xml2 z
LIB_DEPENDS= devel/pcre2
+BUILD_DEPENDS= ${RUN_DEPENDS}
+RUN_DEPENDS= lang/njs
MODULES= lang/python
MODPY_BUILDDEP= No
Re: [PATCH] www/unit: enable njs
On Thu, Sep 07, 2023 at 12:16:39PM +0200, Landry Breuil wrote: > Le Wed, Sep 06, 2023 at 02:12:20PM +0000, Sergey A. Osokin a écrit : [...] > > > > Sure, here's the updated patch. > > i've checked and something is wrong somewhere, because njs is detected > at configure, the unitd binary is supposedly linked against it > > cc -Wl,-E -L/usr/local/lib -o build/sbin/unitd -pipe -fPIC > -fvisibility=hidden -W -Wall -Wextra -Wno-unused-parameter > -Wwrite-strings -fstrict-aliasing -Wstrict-overflow=5 > -Wmissing-prototypes -O2 -pipe -g -I/usr/local/include > build/src/nxt_main.o build/lib/libnxt.a -lm -lpthread > -L/usr/local/lib -Wl,-R/usr/local/lib -lnjs -lm -lpcre2-8 -lcrypto > -lxml2 -lz -lssl -lcrypto-L/usr/local/lib -Wl,-R/usr/local/lib > -lpcre2-8 > > but packaging fails: > Create /usr/ports/packages/amd64/all/unit-1.31.0p0.tgz > LIB_DEPENDS lang/njs not needed for www/unit/unit ? > > and looking at the binary the dependency on the njs library isnt > registered > > $objdump -p build/sbin/unitd|grep NEED > NEEDED libm.so.10.1 > NEEDED libpthread.so.27.1 > NEEDED libpcre2-8.so.0.6 > NEEDED libcrypto.so.52.0 > NEEDED libxml2.so.19.0 > NEEDED libz.so.7.0 > NEEDED libssl.so.55.0 > NEEDED libc.so.97.1 There's no shared library for NJS at the moment, only static library is available. -- Sergey A. Osokin
Re: [PATCH] www/unit: enable njs
On Wed, Sep 06, 2023 at 05:13:24AM +0200, Landry Breuil wrote:
> Le Tue, Sep 05, 2023 at 05:57:09PM +0000, Sergey A. Osokin a écrit :
> > Landry,
> >
> > the recent update in lang/njs you made includes a fix for the
> > njs.pc, so we may have to return to this one? Or am I missing
> > something?
>
> maybe, dont remember the context :)
>
> in all cases it needs REVISION bumps since it changes the dependencies..
Sure, here's the updated patch.
--
Sergey A. Osokin
Index: Makefile.inc
===
RCS file: /cvs/ports/www/unit/Makefile.inc,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile.inc
--- Makefile.inc 5 Sep 2023 11:31:17 - 1.9
+++ Makefile.inc 6 Sep 2023 14:10:35 -
@@ -27,6 +27,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \
--pid=${LOCALSTATEDIR}/run/unit/unit.pid \
--runstatedir=${LOCALSTATEDIR}/run/unit \
--statedir=${LOCALSTATEDIR}/db/unit \
+ --njs \
--tmpdir=${LOCALSTATEDIR}/tmp/unit \
--openssl \
--user=_unit \
Index: unit/Makefile
===
RCS file: /cvs/ports/www/unit/unit/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- unit/Makefile 4 Sep 2023 17:02:21 - 1.6
+++ unit/Makefile 6 Sep 2023 14:10:35 -
@@ -1,8 +1,11 @@
COMMENT= dynamic web application server
+REVISION= 0
+
WANTLIB= c crypto m pcre2-8 pthread ssl
-LIB_DEPENDS= devel/pcre2
+LIB_DEPENDS= devel/pcre2 \
+ lang/njs
MODULES= lang/python
MODPY_BUILDDEP= No
Re: [PATCH] www/unit: enable njs
Landry,
the recent update in lang/njs you made includes a fix for the
njs.pc, so we may have to return to this one? Or am I missing
something?
Thank you.
--
Sergey A. Osokin
On Fri, May 26, 2023 at 03:45:53PM +, Sergey A. Osokin wrote:
> Hi,
>
> lang/njs has been added to the ports tree recently, so
> here's the patch to enable nginx javascript for www/unit.
>
> Thank you.
>
> --
> Sergey A. Osokin
> Index: Makefile.inc
> ===
> RCS file: /cvs/ports/www/unit/Makefile.inc,v
> retrieving revision 1.8
> diff -u -p -r1.8 Makefile.inc
> --- Makefile.inc 16 May 2023 08:21:08 - 1.8
> +++ Makefile.inc 26 May 2023 15:43:21 -
> @@ -28,6 +28,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \
> --runstatedir=${LOCALSTATEDIR}/run/unit \
> --statedir=${LOCALSTATEDIR}/db/unit \
> --tmpdir=${LOCALSTATEDIR}/tmp/unit \
> + --njs \
> --openssl \
> --user=_unit \
> --group=_unit
> Index: unit/Makefile
> ===
> RCS file: /cvs/ports/www/unit/unit/Makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile
> --- unit/Makefile 26 Apr 2023 15:57:28 - 1.5
> +++ unit/Makefile 26 May 2023 15:43:21 -
> @@ -2,7 +2,8 @@ COMMENT= dynamic web application server
>
> WANTLIB= c crypto m pcre2-8 pthread ssl
>
> -LIB_DEPENDS= devel/pcre2
> +LIB_DEPENDS= devel/pcre2 \
> + lang/njs
>
> MODULES= lang/python
> MODPY_BUILDDEP= No
Re: CVS: cvs.openbsd.org: ports
Thanks you, Landry! On Tue, Sep 05, 2023 at 11:28:19AM -0600, Landry Breuil wrote: > CVSROOT: /cvs > Module name: ports > Changes by: lan...@cvs.openbsd.org 2023/09/05 11:28:19 > > Modified files: > lang/njs : Makefile distinfo > Added files: > lang/njs/patches: patch-src_njs.pc.in > Removed files: > lang/njs/patches: patch-auto_make patch-external_njs_fs_module_c > > Log message: > lang/njs: update to 0.8.0 > > Diff from Sergey A. Osokin with tweaks by me. >
Re: [PATCH] www/unit: enable njs
On Tue, Sep 05, 2023 at 06:43:30PM +0200, Landry Breuil wrote: [...] > > the attached patch produces the same njs.pc file here. [...] Thanks, Landry, for the details. The patch looks good to me. -- Sergey A. Osokin
Re: [PATCH] www/unit: enable njs
On Tue, Sep 05, 2023 at 05:42:45PM +0200, Landry Breuil wrote:
> Le Tue, Sep 05, 2023 at 02:59:37PM +0000, Sergey A. Osokin a écrit :
> >
> > Alright, let's keep it as is and update the lang/njs to v0.8.0, the patch
> > is attached, thank you.
>
> with the order of includes:
> -I/usr/local/include -Isrc -Ibuild -I/usr/local/include/libxml2
> -I/usr/local/include -Injs
>
> that new version fails to build if 0.7.12 happens to be installed. Not a
> big deal but good to know, and usually should be fixed upstream.
>
> i guess patches/patch-external_njs_fs_module_c should be removed, doesnt
> apply anymore
Sure, forgot to mention that in my previous email.
> the previous comment in the patch
>
> > +++ patches/patch-auto_make 5 Sep 2023 14:57:24 -
> > @@ -1,23 +1,13 @@
> > -should no longer be needed after
> > -https://github.com/nginx/njs/commit/e9d814a0a8c1857f78fdc85ed1461cb9101ebf4e
>
> was a lie ? since we keep the patch and add a new one to patch njs.pc.in
> ? isnt there a way to make all that patching/subst'ing simpler ?
Actually, there was another issue.
> in the end the build does this after auto/make is patched:
> sed -e "s#@PREFIX@#/usr/local#" -e "s#@VERSION@#0.8.0#" -e
> "s#@EXTRA_LIBS@#-lm -L/usr/local/lib -Wl,-R/usr/local/lib -lpcre2-8
> -lcrypto -L/usr/local/lib -lxml2 -lz#" src/njs.pc.in > build/njs.pc
>
> the original unpatched sed was this:
>
> $NJS_BUILD_DIR/njs.pc: $NJS_BUILD_DIR/njs_auto_config.h
> sed -e "s#@PREFIX@#$(pwd)/$NJS_BUILD_DIR#" \\
> -e "s#@LIBDIR@#$(pwd)/$NJS_BUILD_DIR#" \\
> -e "s#@CFLAGS@#-I$(pwd)/$NJS_BUILD_DIR -I$(pwd)/src#" \\
> -e "s#@VERSION@#\$(NJS_VER)#" \\
> -e "s#@EXTRA_LIBS@#-lm $NJS_LIBS $NJS_LIB_AUX_LIBS#" \\
> src/njs.pc.in > \$@
>
> you remove @CFLAGS@ & @LIBDIR@ from njs.pc.in so at that point.. maybe
> we could/should remove patch-auto_make too and directly set what we want
> (${TRUEPREFIX} ?) in the njs.pc.in file ? all this seems.. convoluted to
> me.
Not sure what's the latest suggestion means, could you provide a bit more
detail on this, thank you.
--
Sergey A. Osokin
Re: [PATCH] www/unit: enable njs
On Tue, Sep 05, 2023 at 04:35:50PM +0200, Landry Breuil wrote:
[...]
> i get that for you as a maintainer it might be better/consistent, but i
> have to disagree here. What do we gain from having them split ? users
> wanting just a binary without the header/library ? disk space ? the two
> ports would build from the same tarball/distfile anyway.
>
> In addition, a @pkgpath/@conflict would be needed to handle the upgrade
> path.
>
> Landry
Alright, let's keep it as is and update the lang/njs to v0.8.0, the patch
is attached, thank you.
--
Sergey A. Osokin
Index: Makefile
===
RCS file: /cvs/ports/lang/njs/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 17 Jun 2023 03:03:18 - 1.2
+++ Makefile 5 Sep 2023 14:57:24 -
@@ -2,7 +2,7 @@ COMMENT= NGINX JavaScript command line u
GH_ACCOUNT= nginx
GH_PROJECT= njs
-GH_TAGNAME= 0.7.12
+GH_TAGNAME= 0.8.0
CATEGORIES= lang www
@@ -24,6 +24,9 @@ LIB_DEPENDS= devel/pcre2 \
CONFIGURE_STYLE=simple
ALL_TARGET= libnjs njs
+
+post-patch:
+ ${SUBST_CMD} ${WRKSRC}/auto/make
do-install:
${INSTALL_PROGRAM} ${WRKDIST}/build/njs ${PREFIX}/bin
Index: distinfo
===
RCS file: /cvs/ports/lang/njs/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 25 May 2023 09:29:24 - 1.1.1.1
+++ distinfo 5 Sep 2023 14:57:24 -
@@ -1,2 +1,2 @@
-SHA256 (njs-0.7.12.tar.gz) = enWjkCLftY2/RhBTkDoHzEjdSUL32CpGYBgZwbAHdoc=
-SIZE (njs-0.7.12.tar.gz) = 662554
+SHA256 (njs-0.8.0.tar.gz) = uYAz//aq3LuOEIuW6AwNlMbiEDvL51hGta4LVgaWCEs=
+SIZE (njs-0.8.0.tar.gz) = 715391
Index: patches/patch-auto_make
===
RCS file: /cvs/ports/lang/njs/patches/patch-auto_make,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-auto_make
--- patches/patch-auto_make 25 May 2023 09:29:24 - 1.1.1.1
+++ patches/patch-auto_make 5 Sep 2023 14:57:24 -
@@ -1,23 +1,13 @@
-should no longer be needed after
-https://github.com/nginx/njs/commit/e9d814a0a8c1857f78fdc85ed1461cb9101ebf4e
-
-Index: auto/make
auto/make.orig
+--- auto/make.orig 2023-07-11 23:27:41 UTC
+++ auto/make
-@@ -320,11 +320,11 @@ cat << END >> $NJS_MAKEFILE
+@@ -320,9 +320,7 @@ cat << END >> $NJS_MAKEFILE
pc: $NJS_BUILD_DIR/njs.pc
$NJS_BUILD_DIR/njs.pc: $NJS_BUILD_DIR/njs_auto_config.h
-- sed -e "s,@PREFIX@,$(pwd)/$NJS_BUILD_DIR," \\
-- -e "s,@LIBDIR@,$(pwd)/$NJS_BUILD_DIR," \\
-- -e "s,@CFLAGS@,-I$(pwd)/$NJS_BUILD_DIR -I$(pwd)/src," \\
-- -e "s,@VERSION@,\$(NJS_VER)," \\
-- -e "s,@EXTRA_LIBS@,-lm $NJS_LIBS $NJS_LIB_AUX_LIBS," \\
-+ sed -e "s|@PREFIX@|$(pwd)/$NJS_BUILD_DIR|" \\
-+ -e "s|@LIBDIR@|$(pwd)/$NJS_BUILD_DIR|" \\
-+ -e "s|@CFLAGS@|-I$(pwd)/$NJS_BUILD_DIR -I$(pwd)/src|" \\
-+ -e "s|@VERSION@|\$(NJS_VER)|" \\
-+ -e "s|@EXTRA_LIBS@|-lm $NJS_LIBS $NJS_LIB_AUX_LIBS|" \\
+- sed -e "s#@PREFIX@#$(pwd)/$NJS_BUILD_DIR#" \\
+- -e "s#@LIBDIR@#$(pwd)/$NJS_BUILD_DIR#" \\
+- -e "s#@CFLAGS@#-I$(pwd)/$NJS_BUILD_DIR -I$(pwd)/src#" \\
++ sed -e "s#@PREFIX@#${TRUEPREFIX}#" \\
+ -e "s#@VERSION@#\$(NJS_VER)#" \\
+ -e "s#@EXTRA_LIBS@#-lm $NJS_LIBS $NJS_LIB_AUX_LIBS#" \\
src/njs.pc.in > \$@
- END
-
--- /dev/null Tue Sep 5 09:58:00 2023
+++ patches/patch-src_njs.pc.in Tue Sep 5 09:44:23 2023
@@ -0,0 +1,13 @@
+--- src/njs.pc.in.orig 2023-07-11 23:13:20 UTC
src/njs.pc.in
+@@ -1,8 +1,8 @@
+ prefix=@PREFIX@
+-libdir=@LIBDIR@
++libdir=${prefix}/lib
+
+ Name: njs
+ Description: library to embed njs scripting language
+ Version: @VERSION@
+ Libs: -L${libdir} -lnjs @EXTRA_LIBS@
+-Cflags: @CFLAGS@
++Cflags: -I${prefix}/include
Re: www/unit update to 1.31.0
On Tue, Sep 05, 2023 at 11:31:20AM +, Klemens Nanni wrote: > On Tue, Sep 05, 2023 at 12:45:20AM +0000, Sergey A. Osokin wrote: > > here's the www/unit update to version 1.31.0, could you > > please review and commit. > > Committed, thanks. Thanks you, Klemens! -- Sergey A. Osokin
Re: [PATCH] www/unit: enable njs
Hi Landry,
thank you for the review, comments and suggestions.
> Le Sat, May 27, 2023 at 09:55:48AM +0200, Landry Breuil a écrit :
[...]
> +post-patch:
> + ${SUBST_CMD} ${WRKSRC}/auto/make
> +
> do-install:
[...]
I have decided to split existing lang/njs port into two ports:
- devel/libnjs
- lang/njs
That will be consistent with the same family of NJS ports in
FreeBSD ports and NetBSD packages tree.
Based on that, there are two files are attached to this email:
- openbsd-libnjs.shar, new devel/libnjs port, v0.8.0;
- openbsd-njs-0.8.0.diff, the update of existing lang/njs port
to v0.8.0, reduce targets from two to one (njs), move library
specific files to the new port.
Also, both patches from lang/njs/patches directory (patch-auto_make and
patch-external_njs_fs_module_c) can be safely removed with this
update.
Thank you.
--
Sergey A. Osokin
Index: Makefile
===
RCS file: /cvs/ports/lang/njs/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 17 Jun 2023 03:03:18 - 1.2
+++ Makefile 5 Sep 2023 14:17:28 -
@@ -1,8 +1,8 @@
-COMMENT= NGINX JavaScript command line utility and static library
+COMMENT= NGINX JavaScript command line utility
GH_ACCOUNT= nginx
GH_PROJECT= njs
-GH_TAGNAME= 0.7.12
+GH_TAGNAME= 0.8.0
CATEGORIES= lang www
@@ -23,13 +23,9 @@ LIB_DEPENDS= devel/pcre2 \
CONFIGURE_STYLE=simple
-ALL_TARGET= libnjs njs
+ALL_TARGET= njs
do-install:
${INSTALL_PROGRAM} ${WRKDIST}/build/njs ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/src/*.h ${PREFIX}/include
- ${INSTALL_DATA} ${WRKSRC}/build/njs_auto_config.h ${PREFIX}/include
- ${INSTALL_DATA} ${WRKSRC}/build/libnjs.a ${PREFIX}/lib
- ${INSTALL_DATA} ${WRKSRC}/build/njs.pc ${PREFIX}/lib/pkgconfig
.include
Index: distinfo
===
RCS file: /cvs/ports/lang/njs/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 25 May 2023 09:29:24 - 1.1.1.1
+++ distinfo 5 Sep 2023 14:17:28 -
@@ -1,2 +1,2 @@
-SHA256 (njs-0.7.12.tar.gz) = enWjkCLftY2/RhBTkDoHzEjdSUL32CpGYBgZwbAHdoc=
-SIZE (njs-0.7.12.tar.gz) = 662554
+SHA256 (njs-0.8.0.tar.gz) = uYAz//aq3LuOEIuW6AwNlMbiEDvL51hGta4LVgaWCEs=
+SIZE (njs-0.8.0.tar.gz) = 715391
Index: pkg/PLIST
===
RCS file: /cvs/ports/lang/njs/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 25 May 2023 09:29:24 - 1.1.1.1
+++ pkg/PLIST 5 Sep 2023 14:17:28 -
@@ -1,75 +1 @@
@bin bin/njs
-include/njs.h
-include/njs_addr2line.h
-include/njs_arr.h
-include/njs_array.h
-include/njs_array_buffer.h
-include/njs_assert.h
-include/njs_async.h
-include/njs_auto_config.h
-include/njs_boolean.h
-include/njs_buffer.h
-include/njs_chb.h
-include/njs_clang.h
-include/njs_date.h
-include/njs_diyfp.h
-include/njs_djb_hash.h
-include/njs_dtoa.h
-include/njs_dtoa_fixed.h
-include/njs_encoding.h
-include/njs_error.h
-include/njs_event.h
-include/njs_file.h
-include/njs_function.h
-include/njs_generator.h
-include/njs_iterator.h
-include/njs_json.h
-include/njs_lexer.h
-include/njs_lexer_tables.h
-include/njs_lvlhsh.h
-include/njs_main.h
-include/njs_malloc.h
-include/njs_math.h
-include/njs_md5.h
-include/njs_module.h
-include/njs_mp.h
-include/njs_murmur_hash.h
-include/njs_number.h
-include/njs_object.h
-include/njs_object_hash.h
-include/njs_object_prop_declare.h
-include/njs_parser.h
-include/njs_promise.h
-include/njs_queue.h
-include/njs_random.h
-include/njs_rbtree.h
-include/njs_regex.h
-include/njs_regexp.h
-include/njs_regexp_pattern.h
-include/njs_scope.h
-include/njs_sha1.h
-include/njs_sha2.h
-include/njs_sprintf.h
-include/njs_str.h
-include/njs_string.h
-include/njs_strtod.h
-include/njs_symbol.h
-include/njs_time.h
-include/njs_timer.h
-include/njs_trace.h
-include/njs_typed_array.h
-include/njs_types.h
-include/njs_unicode.h
-include/njs_unicode_lower_case.h
-include/njs_unicode_upper_case.h
-include/njs_unix.h
-include/njs_utf16.h
-include/njs_utf8.h
-include/njs_utils.h
-include/njs_value.h
-include/njs_value_conversion.h
-include/njs_variable.h
-include/njs_vm.h
-include/njs_vmcode.h
-@static-lib lib/libnjs.a
-lib/pkgconfig/njs.pc
openbsd-libnjs.shar
Description: Unix shell archive
www/unit update to 1.31.0
Hi,
here's the www/unit update to version 1.31.0, could you
please review and commit.
Thank you.
--
Sergey A. Osokin
Index: Makefile.inc
===
RCS file: /cvs/ports/www/unit/Makefile.inc,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile.inc
--- Makefile.inc 16 May 2023 08:21:08 - 1.8
+++ Makefile.inc 5 Sep 2023 00:39:45 -
@@ -1,4 +1,4 @@
-VERSION?= 1.30.0
+VERSION?= 1.31.0
DISTNAME= unit-${VERSION}
CATEGORIES= www
Index: unit/distinfo
===
RCS file: /cvs/ports/www/unit/unit/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- unit/distinfo 16 May 2023 08:21:08 - 1.6
+++ unit/distinfo 5 Sep 2023 00:39:45 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.30.0.tar.gz) = Epuhs8TjPfrb04aD8GNBUtjs93DKzzr1DuULVoPcSYs=
-SIZE (unit-1.30.0.tar.gz) = 894843
+SHA256 (unit-1.31.0.tar.gz) = JosYALxOAwZn5nln0FKBdDff8D94CsCphZCaoiXeYe0=
+SIZE (unit-1.31.0.tar.gz) = 905152
Index: unit-perl/distinfo
===
RCS file: /cvs/ports/www/unit/unit-perl/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- unit-perl/distinfo 16 May 2023 08:21:08 - 1.6
+++ unit-perl/distinfo 5 Sep 2023 00:39:45 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.30.0.tar.gz) = Epuhs8TjPfrb04aD8GNBUtjs93DKzzr1DuULVoPcSYs=
-SIZE (unit-1.30.0.tar.gz) = 894843
+SHA256 (unit-1.31.0.tar.gz) = JosYALxOAwZn5nln0FKBdDff8D94CsCphZCaoiXeYe0=
+SIZE (unit-1.31.0.tar.gz) = 905152
Index: unit-php/distinfo
===
RCS file: /cvs/ports/www/unit/unit-php/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- unit-php/distinfo 16 May 2023 08:21:08 - 1.6
+++ unit-php/distinfo 5 Sep 2023 00:39:45 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.30.0.tar.gz) = Epuhs8TjPfrb04aD8GNBUtjs93DKzzr1DuULVoPcSYs=
-SIZE (unit-1.30.0.tar.gz) = 894843
+SHA256 (unit-1.31.0.tar.gz) = JosYALxOAwZn5nln0FKBdDff8D94CsCphZCaoiXeYe0=
+SIZE (unit-1.31.0.tar.gz) = 905152
Index: unit-python/distinfo
===
RCS file: /cvs/ports/www/unit/unit-python/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- unit-python/distinfo 16 May 2023 08:21:08 - 1.6
+++ unit-python/distinfo 5 Sep 2023 00:39:45 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.30.0.tar.gz) = Epuhs8TjPfrb04aD8GNBUtjs93DKzzr1DuULVoPcSYs=
-SIZE (unit-1.30.0.tar.gz) = 894843
+SHA256 (unit-1.31.0.tar.gz) = JosYALxOAwZn5nln0FKBdDff8D94CsCphZCaoiXeYe0=
+SIZE (unit-1.31.0.tar.gz) = 905152
Index: unit-ruby/Makefile
===
RCS file: /cvs/ports/www/unit/unit-ruby/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- unit-ruby/Makefile 31 May 2023 15:21:53 - 1.6
+++ unit-ruby/Makefile 5 Sep 2023 00:39:45 -
@@ -3,8 +3,6 @@ BROKEN-sparc64= doesn't detect Ruby libr
UNIT_MODNAME= ruby${MODRUBY_REV}
UNIT_SHORTNAME= ruby
-REVISION= 0
-
MODULES+= lang/ruby
# XXX ruby port provide libruby30.so which is picked up in preference to
Index: unit-ruby/distinfo
===
RCS file: /cvs/ports/www/unit/unit-ruby/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- unit-ruby/distinfo 16 May 2023 08:21:08 - 1.6
+++ unit-ruby/distinfo 5 Sep 2023 00:39:45 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.30.0.tar.gz) = Epuhs8TjPfrb04aD8GNBUtjs93DKzzr1DuULVoPcSYs=
-SIZE (unit-1.30.0.tar.gz) = 894843
+SHA256 (unit-1.31.0.tar.gz) = JosYALxOAwZn5nln0FKBdDff8D94CsCphZCaoiXeYe0=
+SIZE (unit-1.31.0.tar.gz) = 905152
Re: [PATCH] www/nginx -- add njs dynamic module
Hi, On Thu, Jul 06, 2023 at 01:28:35PM +, Sergey A. Osokin wrote: > On Thu, Jun 29, 2023 at 02:05:42PM +0000, Sergey A. Osokin wrote: > > On Thu, Jun 29, 2023 at 09:26:58AM +0100, Stuart Henderson wrote: > > > I note you didn't cc the port maintainer on your original mail, > > > was there a reason for that? > > > > Thank you, Stuart, missed that point. > > > > > I've cc'd and included the original mail. What are you thoughts > > > on this please Robert? > > > > Thanks in advance, Robert. > > It seems like there's no objection to commit my changes to > the port. Well, let's do that then. Thanks in advance. Could you please provide an update. Thank you. -- Sergey A. Osokin
Re: [PATCH] www/nginx -- add njs dynamic module
Hi, On Thu, Jun 29, 2023 at 02:05:42PM +, Sergey A. Osokin wrote: > On Thu, Jun 29, 2023 at 09:26:58AM +0100, Stuart Henderson wrote: > > I note you didn't cc the port maintainer on your original mail, > > was there a reason for that? > > Thank you, Stuart, missed that point. > > > I've cc'd and included the original mail. What are you thoughts > > on this please Robert? > > Thanks in advance, Robert. It seems like there's no objection to commit my changes to the port. Well, let's do that then. Thanks in advance. -- Sergey A. Osokin
Re: [PATCH] www/nginx -- add njs dynamic module
On Thu, Jun 29, 2023 at 09:26:58AM +0100, Stuart Henderson wrote: > I note you didn't cc the port maintainer on your original mail, > was there a reason for that? Thank you, Stuart, missed that point. > I've cc'd and included the original mail. What are you thoughts > on this please Robert? Thanks in advance, Robert. -- Sergey A. Osokin
Re: [PATCH] www/nginx -- add njs dynamic module
Hi, On Mon, Jun 19, 2023 at 03:25:42PM +, Sergey A. Osokin wrote: > On Thu, Jun 08, 2023 at 11:30:57PM +0000, Sergey A. Osokin wrote: > > On Wed, May 24, 2023 at 04:14:34PM +0000, Sergey A. Osokin wrote: > > > > > > I'd like to extend the nginx functionality with nginx javascript > > > module, so here's the patch to add the module to the www/nginx > > > port. > > > Please let me know your thoughts. Is there any updates on this? Thank you. -- Sergey A. Osokin
Re: CVS: cvs.openbsd.org: ports
Hi Antoine,
On Tue, Jun 20, 2023 at 04:56:39PM +0200, Antoine Jacoutot wrote:
> On Mon, Jun 19, 2023 at 09:39:13AM -0600, Klemens Nanni wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: k...@cvs.openbsd.org2023/06/19 09:39:13
> >
> > Modified files:
> > net/tdesktop : Makefile distinfo
> > Added files:
> > net/tdesktop/patches:
> >
> > patch-Telegram_lib_base_base_platform_linux_base_system_media_controls_linux_cpp
> >
> > patch-cmake_external_glib_cppgir_CMakeLists_txt
> > patch-cmake_external_glib_cppgir_tools_cppgir_cpp
> > patch-cmake_external_glib_cppgir_tools_genns_cpp
> >
> > Log message:
> > update to tdesktop 4.8.4, build fixes from FreeBSD
>
> Does not configure.
[...]
>
> -- Could NOT find Boost (missing: Boost_DIR)
> -- Found Boost: /usr/local/include (found suitable version "1.80.0", minimum
> required is "1.58") found components: program_options
> CMake Error at cmake/external/glib/cppgir/CMakeLists.txt:39 (message):
> fmtlib.net format library not found
the devel/fmt dependency is missing, could you try the following patch
(not tested).
--
Sergey A. Osokin
Index: Makefile
===
RCS file: /cvs/ports/net/tdesktop/Makefile,v
retrieving revision 1.89
diff -u -p -r1.89 Makefile
--- Makefile19 Jun 2023 15:39:13 - 1.89
+++ Makefile20 Jun 2023 15:22:21 -
@@ -9,6 +9,7 @@ V = 4.8.4
DISTNAME = tdesktop-${V}-full
PKGNAME = ${DISTNAME:-full=}
CATEGORIES = net
+REVISION = 0
DPB_PROPERTIES = parallel
@@ -31,7 +32,7 @@ PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} Qt6Core Qt6DBus Qt6Gui Qt6Network
WANTLIB += Qt6OpenGL Qt6OpenGLWidgets Qt6Svg Qt6Widgets absl_strings
-WANTLIB += avcodec avfilter avformat avutil c crypto dispatch
+WANTLIB += avcodec avfilter avformat avutil c crypto dispatch fmt
WANTLIB += gio-2.0 giomm-2.68 glib-2.0 glibmm-2.68 gobject-2.0
WANTLIB += hunspell-1.7 jpeg lz4 m openal opus protobuf-lite qrcodegencpp
WANTLIB += rnnoise sigc-3.0 swresample swscale tg_owt xcb xcb-keysyms
@@ -66,6 +67,7 @@ LIB_DEPENDS = archivers/lz4 \
audio/opus \
audio/rnnoise \
devel/abseil-cpp \
+ devel/fmt \
devel/glib2 \
devel/glibmm268>=2.76.0 \
devel/libdispatch \
Re: [PATCH] www/nginx -- add njs dynamic module
Hi, On Thu, Jun 08, 2023 at 11:30:57PM +, Sergey A. Osokin wrote: > On Wed, May 24, 2023 at 04:14:34PM +0000, Sergey A. Osokin wrote: > > > > I'd like to extend the nginx functionality with nginx javascript > > module, so here's the patch to add the module to the www/nginx > > port. > > Please let me know your thoughts. could you please provide an update. Thank you. -- Sergey A. Osokin
Re: [PATCH] www/nginx -- add njs dynamic module
Hi, On Wed, May 24, 2023 at 04:14:34PM +, Sergey A. Osokin wrote: > > I'd like to extend the nginx functionality with nginx javascript > module, so here's the patch to add the module to the www/nginx > port. > Please let me know your thoughts. could you please provide an update. Thank you. -- Sergey A. Osokin
Re: [test] nginx-1.25.0 with up to date naxsi
On Sat, May 27, 2023 at 09:27:37AM +0200, Landry Breuil wrote: > Le Fri, May 26, 2023 at 01:21:02PM +0200, Renaud Allard a écrit : > > > > Here is a diff which updates nginx to 1.25.0 like tb@ did and also changes > > the repository for naxsi to an up to date maintained version > > (https://github.com/wargio/naxsi) which is compatible with nginx 1.25.0. > > > > Works for me on amd64 with the newer default naxsi rules. > > Fwiw even numbers (eg 1.25) are 'development' releases of nginx leading > to stable releases with odd numbers (eg 1.26), i'm not sure so far we've > been tracking dev releases. Well, the nginx plus product, available on a commercial subscription, always build on top of the "mainline", i.e. even numbers, of nginx open source. Also, FreeBSD and NetBSD have both versions, stable and mainline, of the nginx open source in their ports/packages trees. I believe that's the good idea to create a separate port for releases from the mainline. Thank you. -- Sergey A. Osokin
[PATCH] www/unit: enable njs
Hi,
lang/njs has been added to the ports tree recently, so
here's the patch to enable nginx javascript for www/unit.
Thank you.
--
Sergey A. Osokin
Index: Makefile.inc
===
RCS file: /cvs/ports/www/unit/Makefile.inc,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile.inc
--- Makefile.inc 16 May 2023 08:21:08 - 1.8
+++ Makefile.inc 26 May 2023 15:43:21 -
@@ -28,6 +28,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \
--runstatedir=${LOCALSTATEDIR}/run/unit \
--statedir=${LOCALSTATEDIR}/db/unit \
--tmpdir=${LOCALSTATEDIR}/tmp/unit \
+ --njs \
--openssl \
--user=_unit \
--group=_unit
Index: unit/Makefile
===
RCS file: /cvs/ports/www/unit/unit/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- unit/Makefile 26 Apr 2023 15:57:28 - 1.5
+++ unit/Makefile 26 May 2023 15:43:21 -
@@ -2,7 +2,8 @@ COMMENT= dynamic web application server
WANTLIB= c crypto m pcre2-8 pthread ssl
-LIB_DEPENDS= devel/pcre2
+LIB_DEPENDS= devel/pcre2 \
+ lang/njs
MODULES= lang/python
MODPY_BUILDDEP= No
[PATCH] www/nginx -- add njs dynamic module
Hi,
I'd like to extend the nginx functionality with nginx javascript
module, so here's the patch to add the module to the www/nginx
port.
Please let me know your thoughts.
Thank you.
--
Sergey A. Osokin
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.165
diff -u -p -r1.165 Makefile
--- Makefile 17 Apr 2023 17:36:58 - 1.165
+++ Makefile 24 May 2023 16:07:23 -
@@ -11,6 +11,7 @@ COMMENT-ldap_auth= nginx LDAP authentica
COMMENT-lua= nginx lua scripting module
COMMENT-headers_more= nginx module for setting/adding/clearing headers
COMMENT-perl= nginx perl scripting module
+COMMENT-njs= nginx javascript scripting module
COMMENT-passenger= nginx passenger (ruby/python/nodejs) integration module
COMMENT-rtmp= nginx module for RTMP streaming
COMMENT-securelink= nginx HMAC secure link module
@@ -18,7 +19,9 @@ COMMENT-securelink= nginx HMAC secure li
VERSION= 1.24.0
DISTNAME= nginx-${VERSION}
CATEGORIES= www
+REVISION= 0
+VERSION-njs= 0.7.12
VERSION-rtmp= 1.2.1
PKGNAME-main= ${DISTNAME}
@@ -32,6 +35,7 @@ PKGNAME-ldap_auth= nginx-ldap_auth-${VER
PKGNAME-lua= nginx-lua-${VERSION}
PKGNAME-headers_more= nginx-headers-more-${VERSION}
PKGNAME-perl= nginx-perl-${VERSION}
+PKGNAME-njs= nginx-njs-${VERSION}
PKGNAME-passenger= nginx-passenger-${VERSION}
PKGNAME-rtmp= nginx-rtmp-${VERSION}
PKGNAME-securelink= nginx-securelink-${VERSION}
@@ -51,6 +55,7 @@ _GH_MODS= \
nbs-system naxsid714f1636ea49a9a9f4f06dba14aee003e970834 \
kvspb nginx-auth-ldap 83c059b73566c2ee9cbda920d91b66657cf120b7 \
arut nginx-rtmp-module v${VERSION-rtmp} \
+ nginx njs${VERSION-njs} \
simpl ngx_devel_kit v0.3.0 \
leev ngx_http_geoip2_module 3.3 \
nginx-modules ngx_http_hmac_secure_link_module 48c4625fbbf51ed5a95bfec23fa444f6c3702e50
@@ -70,7 +75,7 @@ MULTI_PACKAGES = -main -naxsi -perl ${MO
MODULE_PACKAGES = -image_filter -geoip2 -xslt -mailproxy -stream \
-passenger -headers_more -ldap_auth -lua -rtmp \
- -securelink
+ -securelink -njs
FLAVOR ?=
PSEUDO_FLAVORS = no_lua no_passenger
@@ -85,6 +90,7 @@ WANTLIB-stream=
WANTLIB-image_filter= gd
WANTLIB-geoip2= maxminddb
WANTLIB-rtmp=
+WANTLIB-njs= pcre2-8 crypto ssl xml2 z
WANTLIB-xslt= exslt xml2 xslt
WANTLIB-naxsi=
WANTLIB-ldap_auth= ldap
@@ -103,6 +109,8 @@ LIB_DEPENDS-ldap_auth= databases/openlda
LIB_DEPENDS-lua= ${MODLUA_LIB_DEPENDS}
LIB_DEPENDS-rtmp=
LIB_DEPENDS-securelink=
+LIB_DEPENDS-njs= devel/pcre2 \
+ textproc/libxml
MODLUA_RUNDEP= No
RUN_DEPENDS= www/nginx,-main=${VERSION}
@@ -150,6 +158,10 @@ CONFIGURE_ARGS+= --add-dynamic-module=${
CONFIGURE_ARGS+= --add-dynamic-module=${WRKDIR}/nginx-rtmp-module-${VERSION-rtmp}/
.endif
+.if ${BUILD_PACKAGES:M-njs}
+CONFIGURE_ARGS+= --add-dynamic-module=${WRKSRC}/njs/nginx
+.endif
+
CONFIGURE_ARGS+= --prefix=${NGINX_DIR} \
--conf-path=${SYSCONFDIR}/nginx/nginx.conf \
--sbin-path=${PREFIX}/sbin/nginx \
@@ -193,7 +205,7 @@ NO_TEST= Yes
ALL_TARGET=
pre-patch:
-.for i in headers-more-nginx-module lua-nginx-module naxsi \
+.for i in headers-more-nginx-module lua-nginx-module naxsi njs \
nginx-auth-ldap ngx_devel_kit ngx_http_geoip2_module \
ngx_http_hmac_secure_link_module
cd ${WRKSRC} && mv ../$i-* $i
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.80
diff -u -p -r1.80 distinfo
--- distinfo 17 Apr 2023 17:36:58 - 1.80
+++ distinfo 24 May 2023 16:07:23 -
@@ -8,6 +8,7 @@ SHA256 (nginx-rtmp-module-v1.2.1.tar.gz)
SHA256 (ngx_devel_kit-v0.3.0.tar.gz) = iOBamainQZBm9a51lm+x78QJutRSLRSYbaB0VUrmFhk=
SHA256 (ngx_http_geoip2_module-3.3.tar.gz) = QTeEOMgz4xOhiGnQxKcnBLSDXDCsr3/WgBOrZzL/eKc=
SHA256 (ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz) = ZXpA2rODS1enIREzlD1OqWwpWcv3NOUXH4eUOgOAmqg=
+SHA256 (njs-0.7.12.tar.gz) = enWjkCLftY2/RhBTkDoHzEjdSUL32CpGYBgZwbAHdoc=
SIZE (headers-more-nginx-module-v0.34.tar.gz) = 28827
SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
SIZE (naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834.tar.gz) = 237272
@@ -18,3 +19,4 @@ SIZE (nginx-rtmp-module-v1.2.1.tar.gz) =
SIZE (ngx_devel_kit-v0.3.0.tar.gz) = 66455
SIZE (ngx_http_geoip2_module-3.3.tar.gz) = 8509
SIZE (ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz) = 6159
+SIZE (njs-0.7.12.tar.gz) = 662554
--- /dev/null Wed May 24 11:08:50 2023
+++ patches/patch-njs_auto_make Wed May 24 11:06:56 2023
@@ -0,0 +1,22 @@
+https://github.com/nginx/njs/commit/e9d814a0a8c1857f78fdc85ed1461cb9101ebf4e
+
+Index: njs/auto/make
+--- njs/auto/make.orig
njs/auto/make
+@@ -320,11 +320,11 @@ cat << END >> $NJS_MAKEFILE
+ pc: $NJS_BUILD_DIR/njs.pc
+
+ $NJS_BUILD_DIR/njs.pc: $NJS_BUILD_DIR/njs_auto_config.h
+- sed -e "s,@PREFIX@,$(pwd)/$NJS_BUILD_DIR," \\
+- -e "s,@LIBDIR
Re: [NEW] devel/libnjs
Hi Landry, On Tue, May 23, 2023 at 09:36:20AM +0200, Landry Breuil wrote: > Le Tue, May 23, 2023 at 08:17:05AM +0100, Stuart Henderson a écrit : > > On 2023/05/23 09:05, Landry Breuil wrote: [...] > > > > > > You don't need the V variable in the Makefile, and it wasn't present in > > > the Makefile sthen@ sent. Also, i still dont understand the need for the > > > auto/make patch, which is not included in the commit you pointed at for > > > the stat thingy (eg > > > https://github.com/nginx/njs/commit/8a03334e27393fc2031f071830f9605f4373b0be) Sorry for another confusion, and thanks Stuart for the right link. Do you need me to fix the Makefile or that can be fixed on your side? > > That patch is ok. One of the variables in the sed replacement has a > > , in it (iirc it was -Wl,something) so it can't be used as a delimiter > > for sed. > > > > https://github.com/nginx/njs/commit/e9d814a0a8c1857f78fdc85ed1461cb9101ebf4e > > Ah, thanks stuart for the explanation, now that makes sense :) > > ok to import then Thank you. -- Sergey A. Osokin
Re: [NEW] devel/libnjs
Hi Stuart, On Mon, May 22, 2023 at 07:11:19PM +0100, Stuart Henderson wrote: > > [...] > > My preference would be a single port in lang/njs providing library and cli. Here's the updated version of lang/njs. Thank you. -- Sergey A. Osokin njs.tgz Description: application/gtar-compressed
Re: [NEW] devel/libnjs
Hi Stuart, On Mon, May 22, 2023 at 06:46:47PM +, Sergey A. Osokin wrote: > On Mon, May 22, 2023 at 07:11:19PM +0100, Stuart Henderson wrote: [...] > > My preference would be a single port in lang/njs providing library and cli. > > I forgot to mention another argument to split the njs library and njs > command line utility into the two ports. In case of specifing multiple > targets, i.e.: > > ALL_TARGET= libnjs njs I've just figured out how to do that, will provide an updated version as soon as I can. Sorry for confision. -- Sergey A. Osokin
Re: [NEW] devel/libnjs
Hi Stuart, thanks very much for your comments. On Mon, May 22, 2023 at 07:11:19PM +0100, Stuart Henderson wrote: > On 2023/05/22 17:28, Sergey A. Osokin wrote: > > On Sat, May 20, 2023 at 06:03:26PM +0200, Landry Breuil wrote: > > > Le Thu, May 18, 2023 at 09:31:35PM +, Sergey A. Osokin a écrit : > > > > Hi there, > > > > > > > > here's the port of nginx javascript static library for OpenBSD > > > > ports tree. > > > > Please let me know your thoughts, ask questions, provide comments. > > > > > > you should be able to use the various GH_PROJECT/GH_ACCOUNT/GH_TAGNAME > > > variables instead of handrolling DISTFILES/MASTER_SITES/PKGNAME/WRKDIST. > > > > That's exactly what I tried to use as a first step, however that didn't > > work for me, so I decided to use this way. > > Please see attached Makefile (and run make makesum to update distinfo). > The way your Makefile has it, the distfile is just named 0.7.12.tar.gz > which is not specific enough. Thanks, I figured out how to do that. > > > is only the static lib necessary in libnjs ? for both ports, why the > > > auto/make patch, afaict, our sed supports s,X,Y, constructs.. > > > > The static library is necessary, and probably a shared library will > > be available for the future releases on nginx javascript. > > > > About the auto/make patch - the issue has been reported to the upstream, > > the upstream's updated, > > https://github.com/nginx/njs/commit/8a03334e27393fc2031f071830f9605f4373b0be > > So, I'll remove that patch with the next release of nginx javascript. > > The patches don't match standard naming conventions, we normally use > "make update-patches" to generate them. To fix them up, you can "make > patch" with the existing patches, then mv the patches dir out the way, > and "make update-patches". (For newly patched files, copy the source > file to filename.orig.port, modify as needed, and make update-patches > to pick them up). > > PLIST should also be autogenerated (and maybe tweaked afterwards if > necessary, but that's the starting point). Run "make plist". Here > the sort order changes, and lib/libnjs.a gets an "@static-lib" > annotation. Thanks. > > > i dont think do-build is necessary, setting ALL_TARGET=libnjs njs should > > > achieve the same. > > > > Good catch, I'm going to re-work this part and let you know how > > that works, thanks. > > > > > why two ports, instead of a single, or eventually a MULTI_PACKAGE ? i > > > suppose your hidden untold goal is to enable support in nginx, if so why > > > not saying it upfront ? > > > > That's good idea. Since those two (devel/libnjs and lang/njs) from > > the different categories, not sure what's the best place to create > > a port for both (similarly to www/unit, I believe). > > My preference would be a single port in lang/njs providing library and cli. I forgot to mention another argument to split the njs library and njs command line utility into the two ports. In case of specifing multiple targets, i.e.: ALL_TARGET= libnjs njs it's possible to get only first thing, i.e. libnjs in this case, but not both. In other words, every "final" target has its own configure target, and so on. So, I believe it's better to keep them splitted. > They're in the same distfile, I don't think it makes all that much sense > to split the package into njs and libnjs really (we don't normally do > that for other software in ports unless there are heavy extra dependencies > in one or the other). There's another target available for the distro - nginx javascript module for nginx. I'll submit a patch for that as soon as I can. > > Also, I'm going to enable nginx javascript support for www/unit, so > > I'd like to create that the same way as I did that for FreeBSD and > > NetBSD. > > sounds good to me. Thanks. And here's the updated version of devel/libnjs port. I'm going to update lang/njs port as well and submit the updated one in a separated mail thread. -- Sergey A. Osokin libnjs.tar.gz Description: application/gzip
Re: [NEW] devel/libnjs
Hi Landry, On Sat, May 20, 2023 at 06:03:26PM +0200, Landry Breuil wrote: > Le Thu, May 18, 2023 at 09:31:35PM +0000, Sergey A. Osokin a écrit : > > Hi there, > > > > here's the port of nginx javascript static library for OpenBSD > > ports tree. > > Please let me know your thoughts, ask questions, provide comments. > > you should be able to use the various GH_PROJECT/GH_ACCOUNT/GH_TAGNAME > variables instead of handrolling DISTFILES/MASTER_SITES/PKGNAME/WRKDIST. That's exactly what I tried to use as a first step, however that didn't work for me, so I decided to use this way. > is only the static lib necessary in libnjs ? for both ports, why the > auto/make patch, afaict, our sed supports s,X,Y, constructs.. The static library is necessary, and probably a shared library will be available for the future releases on nginx javascript. About the auto/make patch - the issue has been reported to the upstream, the upstream's updated, https://github.com/nginx/njs/commit/8a03334e27393fc2031f071830f9605f4373b0be So, I'll remove that patch with the next release of nginx javascript. > i dont think do-build is necessary, setting ALL_TARGET=libnjs njs should > achieve the same. Good catch, I'm going to re-work this part and let you know how that works, thanks. > why two ports, instead of a single, or eventually a MULTI_PACKAGE ? i > suppose your hidden untold goal is to enable support in nginx, if so why > not saying it upfront ? That's good idea. Since those two (devel/libnjs and lang/njs) from the different categories, not sure what's the best place to create a port for both (similarly to www/unit, I believe). Also, I'm going to enable nginx javascript support for www/unit, so I'd like to create that the same way as I did that for FreeBSD and NetBSD. Thank you. -- Sergey A. Osokin
[NEW] lang/njs
Hi there, here's the port of nginx javascript command line utility for OpenBSD ports tree. Please let me know your thoughts, ask questions, provide comments. Thank you. -- Sergey A. Osokin njs.tgz Description: application/gtar-compressed
[NEW] devel/libnjs
Hi there, here's the port of nginx javascript static library for OpenBSD ports tree. Please let me know your thoughts, ask questions, provide comments. Thank you. -- Sergey A. Osokin libnjs.tgz Description: application/gtar-compressed
Re: www/unit update to 1.30.0
Hi Landry, On Tue, May 16, 2023 at 10:23:23AM +0200, Landry Breuil wrote: > Le Mon, May 15, 2023 at 11:05:54PM +0000, Sergey A. Osokin a écrit : > > > > could you please review and commit the attached patch to update > > www/unit ports to their recent version. > > commited, thanks ! Thank you. -- Sergey A. Osokin
www/unit update to 1.30.0
Hi,
could you please review and commit the attached patch to update
www/unit ports to their recent version.
Thank you.
--
Sergey A. Osokin
Index: Makefile.inc
===
RCS file: /cvs/ports/www/unit/Makefile.inc,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile.inc
--- Makefile.inc 26 Apr 2023 15:57:28 - 1.7
+++ Makefile.inc 15 May 2023 23:00:43 -
@@ -1,4 +1,4 @@
-VERSION?= 1.29.1
+VERSION?= 1.30.0
DISTNAME= unit-${VERSION}
CATEGORIES= www
@@ -20,12 +20,14 @@ CFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS= --prefix=${PREFIX} \
--ld-opt="-L${LOCALBASE}/lib" \
--log=${LOCALSTATEDIR}/log/unit/unit.log \
+ --logdir=${LOCALSTATEDIR}/log/unit \
--mandir=${PREFIX}/man \
- --modules=lib/unit/modules \
+ --modulesdir=${PREFIX}/lib/unit/modules \
--control=unix:${LOCALSTATEDIR}/run/unit/control.unit.sock \
--pid=${LOCALSTATEDIR}/run/unit/unit.pid \
- --state=${LOCALSTATEDIR}/db/unit \
- --tmp=${LOCALSTATEDIR}/tmp/unit \
+ --runstatedir=${LOCALSTATEDIR}/run/unit \
+ --statedir=${LOCALSTATEDIR}/db/unit \
+ --tmpdir=${LOCALSTATEDIR}/tmp/unit \
--openssl \
--user=_unit \
--group=_unit
@@ -43,6 +45,6 @@ ALL_TARGET= ${UNIT_MODNAME}
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/unit/modules/
- ${INSTALL_DATA} ${WRKSRC}/build/${UNIT_MODNAME}.unit.so \
+ ${INSTALL_DATA} ${WRKSRC}/build/lib/unit/modules/${UNIT_MODNAME}.unit.so \
${PREFIX}/lib/unit/modules/
.endif
Index: unit/distinfo
===
RCS file: /cvs/ports/www/unit/unit/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- unit/distinfo 26 Apr 2023 15:57:28 - 1.5
+++ unit/distinfo 15 May 2023 23:00:43 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.29.1.tar.gz) = fXVs/4waQLOMMT/b6HSDM//OA0o5FvobUC1jzBBiNDc=
-SIZE (unit-1.29.1.tar.gz) = 906654
+SHA256 (unit-1.30.0.tar.gz) = Epuhs8TjPfrb04aD8GNBUtjs93DKzzr1DuULVoPcSYs=
+SIZE (unit-1.30.0.tar.gz) = 894843
Index: unit-perl/distinfo
===
RCS file: /cvs/ports/www/unit/unit-perl/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- unit-perl/distinfo 26 Apr 2023 15:57:28 - 1.5
+++ unit-perl/distinfo 15 May 2023 23:00:43 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.29.1.tar.gz) = fXVs/4waQLOMMT/b6HSDM//OA0o5FvobUC1jzBBiNDc=
-SIZE (unit-1.29.1.tar.gz) = 906654
+SHA256 (unit-1.30.0.tar.gz) = Epuhs8TjPfrb04aD8GNBUtjs93DKzzr1DuULVoPcSYs=
+SIZE (unit-1.30.0.tar.gz) = 894843
Index: unit-php/distinfo
===
RCS file: /cvs/ports/www/unit/unit-php/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- unit-php/distinfo 26 Apr 2023 15:57:28 - 1.5
+++ unit-php/distinfo 15 May 2023 23:00:43 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.29.1.tar.gz) = fXVs/4waQLOMMT/b6HSDM//OA0o5FvobUC1jzBBiNDc=
-SIZE (unit-1.29.1.tar.gz) = 906654
+SHA256 (unit-1.30.0.tar.gz) = Epuhs8TjPfrb04aD8GNBUtjs93DKzzr1DuULVoPcSYs=
+SIZE (unit-1.30.0.tar.gz) = 894843
Index: unit-python/distinfo
===
RCS file: /cvs/ports/www/unit/unit-python/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- unit-python/distinfo 26 Apr 2023 15:57:29 - 1.5
+++ unit-python/distinfo 15 May 2023 23:00:43 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.29.1.tar.gz) = fXVs/4waQLOMMT/b6HSDM//OA0o5FvobUC1jzBBiNDc=
-SIZE (unit-1.29.1.tar.gz) = 906654
+SHA256 (unit-1.30.0.tar.gz) = Epuhs8TjPfrb04aD8GNBUtjs93DKzzr1DuULVoPcSYs=
+SIZE (unit-1.30.0.tar.gz) = 894843
Index: unit-ruby/distinfo
===
RCS file: /cvs/ports/www/unit/unit-ruby/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- unit-ruby/distinfo 26 Apr 2023 15:57:29 - 1.5
+++ unit-ruby/distinfo 15 May 2023 23:00:43 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.29.1.tar.gz) = fXVs/4waQLOMMT/b6HSDM//OA0o5FvobUC1jzBBiNDc=
-SIZE (unit-1.29.1.tar.gz) = 906654
+SHA256 (unit-1.30.0.tar.gz) = Epuhs8TjPfrb04aD8GNBUtjs93DKzzr1DuULVoPcSYs=
+SIZE (unit-1.30.0.tar.gz) = 894843
Re: www/unit update to 1.29.1
On Wed, Apr 26, 2023 at 04:57:32PM +0100, Stuart Henderson wrote: > thanks, committed Thank you, Stuart! -- Sergey A. Osokin
Re: www/unit update to 1.29.1
Hi, On Wed, Apr 19, 2023 at 10:02:59PM +, Sergey A. Osokin wrote: > > could you please review and commit the following update. Gentle reminder. Thank you. -- Sergey A. Osokin
www/unit update to 1.29.1
(unit-1.29.1.tar.gz) = fXVs/4waQLOMMT/b6HSDM//OA0o5FvobUC1jzBBiNDc= +SIZE (unit-1.29.1.tar.gz) = 906654 -- Sergey A. Osokin
Re: UPDATE www/nginx-1.24.0
On Mon, Apr 17, 2023 at 11:00:38AM +0100, Stuart Henderson wrote: > On 2023/04/16 20:28, Bjorn Ketelaars wrote: > > Diff below updates nginx to 1.24.0, which is the latest stable release. > > Overview on changes can be found at http://nginx.org/en/CHANGES-1.24. > > > > Switched pcre to pcre2 now to naxsi HEAD supports this. Updated > > headers-more-nginx-module to a newer version because nginx >1.23.0 > > changed handling of multiple headers. Added 2 patches for > > lua-nginx-module because of the header change. > > > > Lightly run test, with a simple config, on am64. > > > > Comments/OK? > > Works here with my usual config (not using the subpackaged modules, > but various proxies etc). ok for me, nice to see another devel/pcre > user get replaced with pcre2. Some third-party modules, such as lua, may require pcre, version 1. -- Sergey A. Osokin
Re: security update www/nginx to 1.22.1
Hi, On Thu, Oct 27, 2022 at 01:58:01PM +, Sergey A. Osokin wrote: > > [...] Could you please provide an update. Thank you. -- Sergey A. Osokin signature.asc Description: PGP signature
Re: security update www/nginx to 1.22.1
On Thu, Oct 20, 2022 at 04:43:56PM +, Sergey A. Osokin wrote: > On Thu, Oct 20, 2022 at 08:47:13AM +0200, Robert Nagy wrote: > > On 19/10/22 18:23 +0100, Stuart Henderson wrote: > > > On 2022/10/19 16:30, Sergey A. Osokin wrote: > > > > Hi, > > > > > > > > could you please review the following changes for the security > > > > update www/nginx to the recent stable version, 1.22.1. > > > > > > adding maintainer to CC, it's usually helpful .. > > > > that release and cve only affects the ngx_http_mp4_module which > > we do not enable > > Not a problem, here's another patch to add njs module I posted earlier > and to update other third-party modules. [...] Could you please provide an update. Thank you. -- Sergey A. Osokin signature.asc Description: PGP signature
Re: security update www/nginx to 1.22.1
On Thu, Oct 20, 2022 at 08:47:13AM +0200, Robert Nagy wrote:
> On 19/10/22 18:23 +0100, Stuart Henderson wrote:
> > On 2022/10/19 16:30, Sergey A. Osokin wrote:
> > > Hi,
> > >
> > > could you please review the following changes for the security
> > > update www/nginx to the recent stable version, 1.22.1.
> >
> > adding maintainer to CC, it's usually helpful ..
>
> that release and cve only affects the ngx_http_mp4_module which
> we do not enable
Not a problem, here's another patch to add njs module I posted earlier
and to update other third-party modules.
Thanks you.
--
Sergey A. Osokin
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.164
diff -u -p -r1.164 Makefile
--- Makefile 29 Aug 2022 19:15:18 - 1.164
+++ Makefile 20 Oct 2022 16:40:26 -
@@ -7,6 +7,7 @@ COMMENT-xslt= nginx XSLT filter module
COMMENT-mailproxy= nginx mail proxy module
COMMENT-stream= nginx TCP/UDP proxy module
COMMENT-naxsi= nginx web application firewall module
+COMMENT-njs= nginx JavaScript module
COMMENT-ldap_auth= nginx LDAP authentication module
COMMENT-lua= nginx lua scripting module
COMMENT-headers_more= nginx module for setting/adding/clearing headers
@@ -15,26 +16,28 @@ COMMENT-passenger= nginx passenger (ruby
COMMENT-rtmp= nginx module for RTMP streaming
COMMENT-securelink= nginx HMAC secure link module
-VERSION= 1.22.0
+VERSION= 1.22.1
DISTNAME= nginx-${VERSION}
CATEGORIES= www
-VERSION-rtmp= 1.2.1
+PORTREVISION= 0
+
+VERSION-rtmp= 1.2.2
PKGNAME-main= ${DISTNAME}
-PKGNAME-image_filter= nginx-image_filter-${VERSION}
PKGNAME-geoip2= nginx-geoip2-${VERSION}
-PKGNAME-xslt= nginx-xslt-${VERSION}
+PKGNAME-headers_more= nginx-headers-more-${VERSION}
+PKGNAME-image_filter= nginx-image_filter-${VERSION}
PKGNAME-mailproxy= nginx-mailproxy-${VERSION}
-PKGNAME-stream= nginx-stream-${VERSION}
-PKGNAME-naxsi= nginx-naxsi-${VERSION}
PKGNAME-ldap_auth= nginx-ldap_auth-${VERSION}
PKGNAME-lua= nginx-lua-${VERSION}
-PKGNAME-headers_more= nginx-headers-more-${VERSION}
-PKGNAME-perl= nginx-perl-${VERSION}
+PKGNAME-naxsi= nginx-naxsi-${VERSION}
PKGNAME-passenger= nginx-passenger-${VERSION}
+PKGNAME-perl= nginx-perl-${VERSION}
PKGNAME-rtmp= nginx-rtmp-${VERSION}
PKGNAME-securelink= nginx-securelink-${VERSION}
+PKGNAME-stream= nginx-stream-${VERSION}
+PKGNAME-xslt= nginx-xslt-${VERSION}
REVISION-main= 0
@@ -48,14 +51,15 @@ MASTER_SITES1= https://raw.githubusercon
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
_GH_MODS= \
- openresty headers-more-nginx-module v0.33 \
- openresty lua-nginx-module v0.10.11 \
- nbs-system naxsi1.3 \
- kvspb nginx-auth-ldap 83c059b73566c2ee9cbda920d91b66657cf120b7 \
arut nginx-rtmp-module v${VERSION-rtmp} \
- simpl ngx_devel_kit v0.3.0 \
+ kvspb nginx-auth-ldap 83c059b73566c2ee9cbda920d91b66657cf120b7 \
leev ngx_http_geoip2_module 3.3 \
- nginx-modules ngx_http_hmac_secure_link_module 48c4625fbbf51ed5a95bfec23fa444f6c3702e50
+ nbs-system naxsi1.3 \
+ nginx njs0.7.7 \
+ nginx-modules ngx_http_hmac_secure_link_module 8c5449202cd5afd8970f316bd6828d28281dc9bc \
+ openresty headers-more-nginx-module v0.33 \
+ openresty lua-nginx-module v0.10.11 \
+ vision5 ngx_devel_kit v0.3.1
.for _a _p _c in ${_GH_MODS}
DISTFILES+= ${_p}-{${_a}/${_p}/archive/}${_c}.tar.gz:0
@@ -70,9 +74,9 @@ PERMIT_PACKAGE= Yes
MULTI_PACKAGES = -main -naxsi -perl ${MODULE_PACKAGES}
-MODULE_PACKAGES = -image_filter -geoip2 -xslt -mailproxy -stream \
- -passenger -headers_more -ldap_auth -lua -rtmp \
- -securelink
+MODULE_PACKAGES = -headers_more -geoip2 -image_filter \
+ -ldap_auth -lua -mailproxy -passenger \
+ -rtmp -securelink -stream -xslt
FLAVOR ?=
PSEUDO_FLAVORS = no_lua no_passenger
@@ -82,29 +86,30 @@ COMPILER = base-clang ports-gcc base-gc
.include
WANTLIB-main= c z pcre ssl crypto
-WANTLIB-mailproxy=
-WANTLIB-stream=
-WANTLIB-image_filter= gd
+WANTLIB-headers_more=
WANTLIB-geoip2= maxminddb
-WANTLIB-rtmp=
-WANTLIB-xslt= exslt xml2 xslt
-WANTLIB-naxsi=
+WANTLIB-image_filter= gd
WANTLIB-ldap_auth= ldap
+WANTLIB-mailproxy=
+WANTLIB-naxsi=
+WANTLIB-njs=
WANTLIB-lua= ${MODLUA_WANTLIB} m
-WANTLIB-headers_more=
WANTLIB-perl= c m perl
WANTLIB-passenger= m pthread ${COMPILER_LIBCXX}
+WANTLIB-rtmp=
WANTLIB-securelink= crypto
+WANTLIB-stream=
+WANTLIB-xslt= exslt xml2 xslt
LIB_DEPENDS-main= devel/pcre
-LIB_DEPENDS-xslt= textproc/libxml \
- textproc/libxslt
-LIB_DEPENDS-image_filter=graphics/gd
LIB_DEPENDS-geoip2= net/libmaxminddb
+LIB_DEPENDS-image_filter=graphics/gd
LIB_DEPENDS-ldap_auth= databases/openldap
LIB_DEPENDS-lua= ${MODLUA_LIB_DEPENDS}
LIB_DEPENDS-rtmp=
LIB_DEPENDS-securelink=
+LIB_DEPENDS-xslt= textproc/libxml \
+ textproc/libxslt
MODLUA_RUNDEP= No
RUN_DEPENDS= www/nginx,-main=${VERSION}
@@ -196,7 +201,7 @@ NO_TEST= Yes
ALL_TARGET=
security update www/nginx to 1.22.1
Hi,
could you please review the following changes for the security
update www/nginx to the recent stable version, 1.22.1.
Here's the commit message.
---
www/nginx: security update 1.22.0 -> 1.22.1
*) Security: processing of a specially crafted mp4 file by the
ngx_http_mp4_module might cause a worker process crash, worker
process memory disclosure, or might have potential other impact
(CVE-2022-41741, CVE-2022-41742).
---
Thank you.
--
Sergey A. Osokin
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.164
diff -u -p -r1.164 Makefile
--- Makefile 29 Aug 2022 19:15:18 - 1.164
+++ Makefile 19 Oct 2022 16:22:00 -
@@ -15,7 +15,7 @@ COMMENT-passenger= nginx passenger (ruby
COMMENT-rtmp= nginx module for RTMP streaming
COMMENT-securelink= nginx HMAC secure link module
-VERSION= 1.22.0
+VERSION= 1.22.1
DISTNAME= nginx-${VERSION}
CATEGORIES= www
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.79
diff -u -p -r1.79 distinfo
--- distinfo 30 May 2022 08:17:34 - 1.79
+++ distinfo 19 Oct 2022 16:22:00 -
@@ -2,7 +2,7 @@ SHA256 (headers-more-nginx-module-v0.33.
SHA256 (lua-nginx-module-v0.10.11.tar.gz) = wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY=
SHA256 (naxsi-1.3.tar.gz) = Q5yGdzctJZe0Ngu8wQvIZJDeH8dWlbGTrV3xVKIU1ig=
SHA256 (nginx-1.20.1-chroot.patch) = SS1TB0j8N4/dn5pUTGT6WvkN3aAUuKz5+R0Nt+MG0gk=
-SHA256 (nginx-1.22.0.tar.gz) = sz1Wmm8RoBQzpXzhfoOTXpU61Nx3zdTUD4lsiKwm61M=
+SHA256 (nginx-1.22.1.tar.gz) = nrszOp6CuVKs0+K0rrHU/2QG9ySRurbNn+afDepzfzE=
SHA256 (nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) = aQxOW9sq4ZsP7nXNNW0YATRo20cmFrYJeloLvjRshGQ=
SHA256 (nginx-rtmp-module-v1.2.1.tar.gz) = h6pZdACwtaBSdO4tI9jLgiThJoYiegq+MdeDs6ZF6jc=
SHA256 (ngx_devel_kit-v0.3.0.tar.gz) = iOBamainQZBm9a51lm+x78QJutRSLRSYbaB0VUrmFhk=
@@ -12,7 +12,7 @@ SIZE (headers-more-nginx-module-v0.33.ta
SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
SIZE (naxsi-1.3.tar.gz) = 235626
SIZE (nginx-1.20.1-chroot.patch) = 8783
-SIZE (nginx-1.22.0.tar.gz) = 1073322
+SIZE (nginx-1.22.1.tar.gz) = 1073948
SIZE (nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) = 18542
SIZE (nginx-rtmp-module-v1.2.1.tar.gz) = 519919
SIZE (ngx_devel_kit-v0.3.0.tar.gz) = 66455
signature.asc
Description: PGP signature
Re: Maintainer UPDATE www/unit to 1.28.0
Hi, On Tue, Oct 04, 2022 at 04:06:01AM +, Sergey A. Osokin wrote: > On Tue, Sep 20, 2022 at 02:49:36PM +0000, Sergey A. Osokin wrote: > > > > Could you please review the following maintainer update. > > Please use the following message in the commit log, thanks. > > [... ChangeLog and patch are skipped ...] Could you please provide an update. Thank you. -- Sergey A. Osokin signature.asc Description: PGP signature
Re: Maintainer UPDATE www/unit to 1.28.0
Hi, hope you're doing well. The ports tree has been unlocked recently, could you please provide an update. On Tue, Sep 20, 2022 at 02:49:36PM +, Sergey A. Osokin wrote: > Hi, > > Could you please review the following maintainer update. > Please use the following message in the commit log, thanks. [... ChangeLog and patch are skipped ...] Thank you. -- Sergey A. Osokin signature.asc Description: PGP signature
Maintainer UPDATE www/unit to 1.28.0
Hi,
hope you're doing well.
Could you please review the following maintainer update.
Please use the following message in the commit log, thanks.
*) Change: increased the applications' startup timeout.
*) Change: disallowed abstract Unix domain socket syntax in non-Linux
systems.
*) Feature: basic statistics API.
*) Feature: customizable access log format.
*) Feature: more HTTP variables support.
*) Feature: forwarded header to replace client address and protocol.
*) Feature: ability to get dynamic variables.
*) Feature: support for abstract Unix sockets.
*) Feature: support for Unix sockets in address matching.
*) Feature: the $dollar variable translates to a literal "$" during
variable substitution.
*) Bugfix: router process could crash if index file didn't contain an
extension.
*) Bugfix: force SCRIPT_NAME in Ruby to always be an empty string.
*) Bugfix: when isolated PID numbers reach the prototype process host
PID, the prototype crashed.
*) Bugfix: the Ruby application process could crash on SIGTERM.
*) Bugfix: the Ruby application process could crash on SIGINT.
*) Bugfix: mutex leak in the C API.
--
Sergey A. Osokin
Index: Makefile.inc
===
RCS file: /cvs/ports/www/unit/Makefile.inc,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile.inc
--- Makefile.inc 4 Jun 2022 08:31:22 - 1.5
+++ Makefile.inc 20 Sep 2022 14:43:43 -
@@ -1,4 +1,4 @@
-VERSION?= 1.27.0
+VERSION?= 1.28.0
DISTNAME= unit-${VERSION}
CATEGORIES= www
Index: unit/distinfo
===
RCS file: /cvs/ports/www/unit/unit/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- unit/distinfo 4 Jun 2022 08:31:22 - 1.3
+++ unit/distinfo 20 Sep 2022 14:43:43 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.27.0.tar.gz) = 36iC/390qh1ekqfC1xi9pixARhhuBNRlt8AoqzD9TmY=
-SIZE (unit-1.27.0.tar.gz) = 871783
+SHA256 (unit-1.28.0.tar.gz) = aXeSCO0tFoe10m+MTg+EYEROsoX7bO0kQ2UuDFhKgLA=
+SIZE (unit-1.28.0.tar.gz) = 878878
Index: unit-perl/distinfo
===
RCS file: /cvs/ports/www/unit/unit-perl/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- unit-perl/distinfo 4 Jun 2022 08:31:22 - 1.3
+++ unit-perl/distinfo 20 Sep 2022 14:43:43 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.27.0.tar.gz) = 36iC/390qh1ekqfC1xi9pixARhhuBNRlt8AoqzD9TmY=
-SIZE (unit-1.27.0.tar.gz) = 871783
+SHA256 (unit-1.28.0.tar.gz) = aXeSCO0tFoe10m+MTg+EYEROsoX7bO0kQ2UuDFhKgLA=
+SIZE (unit-1.28.0.tar.gz) = 878878
Index: unit-php/distinfo
===
RCS file: /cvs/ports/www/unit/unit-php/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- unit-php/distinfo 4 Jun 2022 08:31:22 - 1.3
+++ unit-php/distinfo 20 Sep 2022 14:43:43 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.27.0.tar.gz) = 36iC/390qh1ekqfC1xi9pixARhhuBNRlt8AoqzD9TmY=
-SIZE (unit-1.27.0.tar.gz) = 871783
+SHA256 (unit-1.28.0.tar.gz) = aXeSCO0tFoe10m+MTg+EYEROsoX7bO0kQ2UuDFhKgLA=
+SIZE (unit-1.28.0.tar.gz) = 878878
Index: unit-python/distinfo
===
RCS file: /cvs/ports/www/unit/unit-python/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- unit-python/distinfo 4 Jun 2022 08:31:23 - 1.3
+++ unit-python/distinfo 20 Sep 2022 14:43:43 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.27.0.tar.gz) = 36iC/390qh1ekqfC1xi9pixARhhuBNRlt8AoqzD9TmY=
-SIZE (unit-1.27.0.tar.gz) = 871783
+SHA256 (unit-1.28.0.tar.gz) = aXeSCO0tFoe10m+MTg+EYEROsoX7bO0kQ2UuDFhKgLA=
+SIZE (unit-1.28.0.tar.gz) = 878878
Index: unit-ruby/distinfo
===
RCS file: /cvs/ports/www/unit/unit-ruby/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- unit-ruby/distinfo 4 Jun 2022 08:31:23 - 1.3
+++ unit-ruby/distinfo 20 Sep 2022 14:43:43 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.27.0.tar.gz) = 36iC/390qh1ekqfC1xi9pixARhhuBNRlt8AoqzD9TmY=
-SIZE (unit-1.27.0.tar.gz) = 871783
+SHA256 (unit-1.28.0.tar.gz) = aXeSCO0tFoe10m+MTg+EYEROsoX7bO0kQ2UuDFhKgLA=
+SIZE (unit-1.28.0.tar.gz) = 878878
signature.asc
Description: PGP signature
Re: tdesktop: provide qt6 flavour for testing
On Fri, Jun 24, 2022 at 02:20:37PM +, Sergey A. Osokin wrote: > On Fri, Jun 24, 2022 at 10:43:57AM +, Klemens Nanni wrote: > > On Thu, Jun 23, 2022 at 09:44:58PM +0000, Sergey A. Osokin wrote: > > > > > > telegram-deskop 4.0.0, latest release, builds well with Qt5. > > > > On which system? > > FreeBSD 13.1-RELEASE amd64 > > > With patches? > > A couple of patches is required, one from the vendor, > https://github.com/osokin/freebsd-ports/tree/tdesktop/net-im/telegram-desktop/files telegram-deskop 4.0.2, latest bugfix release, builds well with Qt5 on FreeBSD 13.1-RELEASE, no any additional patches required. -- Sergey A. Osokin signature.asc Description: PGP signature
Re: tdesktop: provide qt6 flavour for testing
On Fri, Jun 24, 2022 at 10:43:57AM +, Klemens Nanni wrote: > On Thu, Jun 23, 2022 at 09:44:58PM +0000, Sergey A. Osokin wrote: > > > > telegram-deskop 4.0.0, latest release, builds well with Qt5. > > On which system? FreeBSD 13.1-RELEASE amd64 > With patches? A couple of patches is required, one from the vendor, https://github.com/osokin/freebsd-ports/tree/tdesktop/net-im/telegram-desktop/files > With wayland integration? It's disabled by default. -- Sergey A. Osokin signature.asc Description: PGP signature
Re: tdesktop: provide qt6 flavour for testing
On Thu, Jun 23, 2022 at 03:57:17PM +, Klemens Nanni wrote: > telegram-desktop upstream has been defaulting to Qt6 for some time > and >=3.6.3beta already requires it, but first we lacked behind in our > Qt6 ports and later I noticed regressions with Qt6. > > So at the moment our tdesktop port uses Debian's patch to reenable Qt5 > builds, but newer telegram-desktop versions already require updates to > this patch and we can't carry it forever anyway. Let me add 2 cents. telegram-deskop 4.0.0, latest release, builds well with Qt5. -- Sergey A. Osokin signature.asc Description: PGP signature
Re: [PATCH] www/nginx: update third-party modules
On Wed, Jun 08, 2022 at 06:12:56PM +0100, Stuart Henderson wrote: > On 2022/06/08 18:57, Omar Polo wrote: > > Stuart Henderson wrote: > > > On 2022/06/07 21:11, Omar Polo wrote: > > > > > > > > nginx-lua-1.22.0p0(www/nginx,-lua): > > > > Missing: luajit-5.1.1 from luajit-2.0.5pl20210608 > > > > (/var/www/modules/ngx_http_lua_module.so) > > > > WANTLIB += luajit-5.1 > > > > > > it wouldn't be ideal to restrict building nginx to only archs which have > > > luajit > > > > openresty/lua-nginx-module upstream moved to luajit from 0.10.16 onward, > > see for e.g.: > > > > https://github.com/openresty/lua-nginx-module/commit/d154e5a7c1cbb7810d0224862e577fc8a6b8e3ac > > The luajit 2.0 branch in ports is only for 32-bit arm, amd64, i386, powerpc > so it misses some important archs. > > The upstream 2.1 branch adds arm64 but still not sparc64 and some others. > > I think ngx_http_lua_module build will need to be arch-dependent then, > we don't really want to block nginx build on arm64 and sparc64. > > (Looking at https://github.com/openresty/lua-nginx-module it is probably > also best to fetch github.com/openresty/luajit2 as an additional distfile > and build with that version instead though that's probably best looked > at as an extra step later.) Is that possible to check an arch during the build and in case it's sparc64 platform use lang/lua and lang/luajit-openresty (yes, another port needs to be created) instead? -- Sergey A. Osokin signature.asc Description: PGP signature
Re: [PATCH] update www/unit to 1.27.0
On Tue, Jun 07, 2022 at 03:38:14PM +0100, Stuart Henderson wrote: > On 2022/06/07 11:40, Sergey A. Osokin wrote: > > On Thu, Jun 02, 2022 at 06:38:53PM +0000, Sergey A. Osokin wrote: > > > > > > could you please review and commit the following patch. > > > > [...] > > > > Could you please provide an update. > > https://github.com/openbsd/ports/tree/master/www/unit Thank you, Stuart. -- Sergey A. Osokin signature.asc Description: PGP signature
Re: [PATCH] www/nginx: update third-party modules
Hi, On Fri, Jun 03, 2022 at 03:47:39PM +, Sergey A. Osokin wrote: > Hi, > > thanks for your patience. [...] Could you please provide an update. Thank you. -- Sergey A. Osokin signature.asc Description: PGP signature
Re: [PATCH] update www/unit to 1.27.0
Hi, On Thu, Jun 02, 2022 at 06:38:53PM +, Sergey A. Osokin wrote: > Hi, > > could you please review and commit the following patch. [...] Could you please provide an update. Thank you. -- Sergey A. Osokin signature.asc Description: PGP signature
Re: [PATCH] www/nginx: update third-party modules
Hi,
thanks for your patience.
On Fri, Jun 03, 2022 at 03:14:38PM +, Sergey A. Osokin wrote:
> Please disregard this patch, I've just found another issue.
And here's another version of the patch with the following changes:
o) remove upstreamed patches
o) add DESCR-njs and PLIST-njs files
o) removed sorting staff, will do that later
o) add patch for njs module
While I'm here I've found a compiling issue with the third-party lua
module, so I've just made some additional changes in that place as well.
Now the port builds and installs just fine.
--
Sergey A. Osokin
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.163
diff -u -p -r1.163 Makefile
--- Makefile 30 May 2022 08:17:34 - 1.163
+++ Makefile 3 Jun 2022 15:43:56 -
@@ -7,6 +7,7 @@ COMMENT-xslt= nginx XSLT filter module
COMMENT-mailproxy= nginx mail proxy module
COMMENT-stream= nginx TCP/UDP proxy module
COMMENT-naxsi= nginx web application firewall module
+COMMENT-njs= nginx JavaScript module
COMMENT-ldap_auth= nginx LDAP authentication module
COMMENT-lua= nginx lua scripting module
COMMENT-headers_more= nginx module for setting/adding/clearing headers
@@ -18,8 +19,9 @@ COMMENT-securelink= nginx HMAC secure li
VERSION= 1.22.0
DISTNAME= nginx-${VERSION}
CATEGORIES= www
+REVISION= 0
-VERSION-rtmp= 1.2.1
+VERSION-rtmp= 1.2.2
PKGNAME-main= ${DISTNAME}
PKGNAME-image_filter= nginx-image_filter-${VERSION}
@@ -35,6 +37,7 @@ PKGNAME-perl= nginx-perl-${VERSION}
PKGNAME-passenger= nginx-passenger-${VERSION}
PKGNAME-rtmp= nginx-rtmp-${VERSION}
PKGNAME-securelink= nginx-securelink-${VERSION}
+PKGNAME-njs= nginx-njs-${VERSION}
ONLY_FOR_ARCHS-passenger= aarch64 amd64 arm i386
@@ -47,13 +50,14 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
_GH_MODS= \
openresty headers-more-nginx-module v0.33 \
- openresty lua-nginx-module v0.10.11 \
+ openresty lua-nginx-module v0.10.21 \
nbs-system naxsi1.3 \
kvspb nginx-auth-ldap 83c059b73566c2ee9cbda920d91b66657cf120b7 \
arut nginx-rtmp-module v${VERSION-rtmp} \
- simpl ngx_devel_kit v0.3.0 \
+ vision5 ngx_devel_kit v0.3.1 \
leev ngx_http_geoip2_module 3.3 \
- nginx-modules ngx_http_hmac_secure_link_module 48c4625fbbf51ed5a95bfec23fa444f6c3702e50
+ nginx-modules ngx_http_hmac_secure_link_module 8c5449202cd5afd8970f316bd6828d28281dc9bc \
+ nginx njs0.7.4
.for _a _p _c in ${_GH_MODS}
DISTFILES+= ${_p}-{${_a}/${_p}/archive/}${_c}.tar.gz:0
@@ -70,7 +74,7 @@ MULTI_PACKAGES = -main -naxsi -perl ${MO
MODULE_PACKAGES = -image_filter -geoip2 -xslt -mailproxy -stream \
-passenger -headers_more -ldap_auth -lua -rtmp \
- -securelink
+ -securelink -njs
FLAVOR ?=
PSEUDO_FLAVORS = no_lua no_passenger
@@ -93,6 +97,7 @@ WANTLIB-headers_more=
WANTLIB-perl= c m perl
WANTLIB-passenger= m pthread ${COMPILER_LIBCXX}
WANTLIB-securelink= crypto
+WANTLIB-njs=
LIB_DEPENDS-main= devel/pcre
LIB_DEPENDS-xslt= textproc/libxml \
@@ -100,15 +105,14 @@ LIB_DEPENDS-xslt= textproc/libxml \
LIB_DEPENDS-image_filter=graphics/gd
LIB_DEPENDS-geoip2= net/libmaxminddb
LIB_DEPENDS-ldap_auth= databases/openldap
-LIB_DEPENDS-lua= ${MODLUA_LIB_DEPENDS}
+LIB_DEPENDS-lua= lang/luajit
LIB_DEPENDS-rtmp=
LIB_DEPENDS-securelink=
MODLUA_RUNDEP= No
RUN_DEPENDS= www/nginx,-main=${VERSION}
RUN_DEPENDS-main= # blank (override default)
-RUN_DEPENDS-lua= ${RUN_DEPENDS} \
- ${_MODLUA_RUN_DEPENDS}
+RUN_DEPENDS-lua= lang/luajit
RUN_DEPENDS-passenger= ${RUN_DEPENDS} \
ruby*-passenger-*:www/ruby-passenger
@@ -132,12 +136,15 @@ CONFIGURE_STYLE= simple
MODULES+= perl
.if ${BUILD_PACKAGES:M-lua}
-MODULES+= lang/lua
-CONFIGURE_ENV+= MODLUA_INCL_DIR=${MODLUA_INCL_DIR} \
- MODLUA_LIB=${MODLUA_LIB}
+CONFIGURE_ENV+= LUAJIT_INC=${LOCALBASE}/include/luajit-2.0 \
+ LUAJIT_LIB=${LOCALBASE}/lib
CONFIGURE_ARGS+= --add-dynamic-module=${WRKSRC}/lua-nginx-module
.endif
+.if ${BUILD_PACKAGES:M-njs}
+CONFIGURE_ARGS+= --add-dynamic-module=${WRKSRC}/njs/nginx
+.endif
+
.if ${BUILD_PACKAGES:M-passenger}
MODULES+= lang/ruby
MODRUBY_BUILDDEP= No
@@ -194,7 +201,7 @@ NO_TEST= Yes
ALL_TARGET=
pre-patch:
-.for i in headers-more-nginx-module lua-nginx-module naxsi \
+.for i in headers-more-nginx-module lua-nginx-module naxsi njs \
nginx-auth-ldap ngx_devel_kit ngx_http_geoip2_module \
ngx_http_hmac_secure_link_module
cd ${WRKSRC} && mv ../$i-* $i
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.79
diff -u -p -r1.79 distinfo
--- distinfo 30 May 2022 08:17:34 - 1.79
+++ distinfo 3 Jun 2022 15:43:56 -
@@ -1,20 +1,22 @@
SHA256 (headers-more-nginx-module-v0.33.tar.gz) = o9y6sRepwQO8HqUgD8AKe30q+X/3/VJfFvisJjLjD78=
-SHA256 (lua-nginx-module-v0.10.11.tar.gz) = wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY=
+SHA256 (lua-nginx-module-v0.10.21.tar.gz) = nbdWA
Re: [PATCH] www/nginx: update third-party modules
Please disregard this patch, I've just found another issue. On Fri, Jun 03, 2022 at 02:54:54PM +, Sergey A. Osokin wrote: > On Fri, Jun 03, 2022 at 12:52:48PM +0200, Omar Polo wrote: > > Omar Polo wrote: > > > "Sergey A. Osokin" wrote: > > > > And here's the patch. > > > > > > (+cc robert@; please put the maintainer in Cc so it's easier for them to > > > see the mail) > > Thanks for the review, Omar. > > I've just updated the patch: > o) remove upstreamed patches > o) add DESCR-njs and PLIST-njs files > o) removed sorting staff, will do that later > > While I'm here I've found a compiling issue with the third-party lua > module, so I've just made some additional changes in that place as well. -- Sergey A. Osokin signature.asc Description: PGP signature
Re: [PATCH] www/nginx: update third-party modules
On Fri, Jun 03, 2022 at 12:52:48PM +0200, Omar Polo wrote:
> Omar Polo wrote:
> > Hello,
> >
> > "Sergey A. Osokin" wrote:
> > > And here's the patch.
> >
> > (+cc robert@; please put the maintainer in Cc so it's easier for them to
> > see the mail)
Thanks for the review, Omar.
I've just updated the patch:
o) remove upstreamed patches
o) add DESCR-njs and PLIST-njs files
o) removed sorting staff, will do that later
While I'm here I've found a compiling issue with the third-party lua
module, so I've just made some additional changes in that place as well.
--
Sergey A. Osokin
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.163
diff -u -p -r1.163 Makefile
--- Makefile 30 May 2022 08:17:34 - 1.163
+++ Makefile 3 Jun 2022 14:49:08 -
@@ -7,6 +7,7 @@ COMMENT-xslt= nginx XSLT filter module
COMMENT-mailproxy= nginx mail proxy module
COMMENT-stream= nginx TCP/UDP proxy module
COMMENT-naxsi= nginx web application firewall module
+COMMENT-njs= nginx JavaScript module
COMMENT-ldap_auth= nginx LDAP authentication module
COMMENT-lua= nginx lua scripting module
COMMENT-headers_more= nginx module for setting/adding/clearing headers
@@ -18,8 +19,9 @@ COMMENT-securelink= nginx HMAC secure li
VERSION= 1.22.0
DISTNAME= nginx-${VERSION}
CATEGORIES= www
+REVISION= 0
-VERSION-rtmp= 1.2.1
+VERSION-rtmp= 1.2.2
PKGNAME-main= ${DISTNAME}
PKGNAME-image_filter= nginx-image_filter-${VERSION}
@@ -35,6 +37,7 @@ PKGNAME-perl= nginx-perl-${VERSION}
PKGNAME-passenger= nginx-passenger-${VERSION}
PKGNAME-rtmp= nginx-rtmp-${VERSION}
PKGNAME-securelink= nginx-securelink-${VERSION}
+PKGNAME-njs= nginx-njs-${VERSION}
ONLY_FOR_ARCHS-passenger= aarch64 amd64 arm i386
@@ -47,13 +50,14 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
_GH_MODS= \
openresty headers-more-nginx-module v0.33 \
- openresty lua-nginx-module v0.10.11 \
+ openresty lua-nginx-module v0.10.21 \
nbs-system naxsi1.3 \
kvspb nginx-auth-ldap 83c059b73566c2ee9cbda920d91b66657cf120b7 \
arut nginx-rtmp-module v${VERSION-rtmp} \
- simpl ngx_devel_kit v0.3.0 \
+ vision5 ngx_devel_kit v0.3.1 \
leev ngx_http_geoip2_module 3.3 \
- nginx-modules ngx_http_hmac_secure_link_module 48c4625fbbf51ed5a95bfec23fa444f6c3702e50
+ nginx-modules ngx_http_hmac_secure_link_module 8c5449202cd5afd8970f316bd6828d28281dc9bc \
+ nginx njs0.7.4
.for _a _p _c in ${_GH_MODS}
DISTFILES+= ${_p}-{${_a}/${_p}/archive/}${_c}.tar.gz:0
@@ -70,7 +74,7 @@ MULTI_PACKAGES = -main -naxsi -perl ${MO
MODULE_PACKAGES = -image_filter -geoip2 -xslt -mailproxy -stream \
-passenger -headers_more -ldap_auth -lua -rtmp \
- -securelink
+ -securelink -njs
FLAVOR ?=
PSEUDO_FLAVORS = no_lua no_passenger
@@ -93,6 +97,7 @@ WANTLIB-headers_more=
WANTLIB-perl= c m perl
WANTLIB-passenger= m pthread ${COMPILER_LIBCXX}
WANTLIB-securelink= crypto
+WANTLIB-njs=
LIB_DEPENDS-main= devel/pcre
LIB_DEPENDS-xslt= textproc/libxml \
@@ -132,9 +137,8 @@ CONFIGURE_STYLE= simple
MODULES+= perl
.if ${BUILD_PACKAGES:M-lua}
-MODULES+= lang/lua
-CONFIGURE_ENV+= MODLUA_INCL_DIR=${MODLUA_INCL_DIR} \
- MODLUA_LIB=${MODLUA_LIB}
+CONFIGURE_ENV+= LUAJIT_INC=${LOCALBASE}/include/luajit-2.0 \
+ LUAJIT_LIB=${LOCALBASE}/lib
CONFIGURE_ARGS+= --add-dynamic-module=${WRKSRC}/lua-nginx-module
.endif
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.79
diff -u -p -r1.79 distinfo
--- distinfo 30 May 2022 08:17:34 - 1.79
+++ distinfo 3 Jun 2022 14:49:08 -
@@ -1,20 +1,22 @@
SHA256 (headers-more-nginx-module-v0.33.tar.gz) = o9y6sRepwQO8HqUgD8AKe30q+X/3/VJfFvisJjLjD78=
-SHA256 (lua-nginx-module-v0.10.11.tar.gz) = wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY=
+SHA256 (lua-nginx-module-v0.10.21.tar.gz) = nbdWAAV4767LQ76k/Gz2MaqoCYjYb/5dOv65kniV/60=
SHA256 (naxsi-1.3.tar.gz) = Q5yGdzctJZe0Ngu8wQvIZJDeH8dWlbGTrV3xVKIU1ig=
SHA256 (nginx-1.20.1-chroot.patch) = SS1TB0j8N4/dn5pUTGT6WvkN3aAUuKz5+R0Nt+MG0gk=
SHA256 (nginx-1.22.0.tar.gz) = sz1Wmm8RoBQzpXzhfoOTXpU61Nx3zdTUD4lsiKwm61M=
SHA256 (nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) = aQxOW9sq4ZsP7nXNNW0YATRo20cmFrYJeloLvjRshGQ=
-SHA256 (nginx-rtmp-module-v1.2.1.tar.gz) = h6pZdACwtaBSdO4tI9jLgiThJoYiegq+MdeDs6ZF6jc=
-SHA256 (ngx_devel_kit-v0.3.0.tar.gz) = iOBamainQZBm9a51lm+x78QJutRSLRSYbaB0VUrmFhk=
+SHA256 (nginx-rtmp-module-v1.2.2.tar.gz) = B/Gbe//sXjV7uIIMY+UoHevUX1oubUaxY22SAsPgnXg=
+SHA256 (ngx_devel_kit-v0.3.1.tar.gz) = DpcRBeIQ0nKkl1Z/ouLCVvTjm4RaW6gNNz4muhq/vYU=
SHA256 (ngx_http_geoip2_module-3.3.tar.gz) = QTeEOMgz4xOhiGnQxKcnBLSDXDCsr3/WgBOrZzL/eKc=
-SHA256 (ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz) = ZXpA2rODS1enIREzlD1OqWwpWcv3NOUXH4eUOgOAmqg=
+SHA256 (ngx_http_hmac_secure_l
Re: [PATCH] www/nginx: update third-party modules
And here's the patch.
Thank you.
--
Sergey A. Osokin
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.163
diff -u -p -r1.163 Makefile
--- Makefile 30 May 2022 08:17:34 - 1.163
+++ Makefile 2 Jun 2022 19:38:52 -
@@ -7,6 +7,7 @@ COMMENT-xslt= nginx XSLT filter module
COMMENT-mailproxy= nginx mail proxy module
COMMENT-stream= nginx TCP/UDP proxy module
COMMENT-naxsi= nginx web application firewall module
+COMMENT-njs= nginx JavaScript module
COMMENT-ldap_auth= nginx LDAP authentication module
COMMENT-lua= nginx lua scripting module
COMMENT-headers_more= nginx module for setting/adding/clearing headers
@@ -19,22 +20,24 @@ VERSION= 1.22.0
DISTNAME= nginx-${VERSION}
CATEGORIES= www
-VERSION-rtmp= 1.2.1
+PORTREVISION= 0
+
+VERSION-rtmp= 1.2.2
PKGNAME-main= ${DISTNAME}
-PKGNAME-image_filter= nginx-image_filter-${VERSION}
PKGNAME-geoip2= nginx-geoip2-${VERSION}
-PKGNAME-xslt= nginx-xslt-${VERSION}
+PKGNAME-headers_more= nginx-headers-more-${VERSION}
+PKGNAME-image_filter= nginx-image_filter-${VERSION}
PKGNAME-mailproxy= nginx-mailproxy-${VERSION}
-PKGNAME-stream= nginx-stream-${VERSION}
-PKGNAME-naxsi= nginx-naxsi-${VERSION}
PKGNAME-ldap_auth= nginx-ldap_auth-${VERSION}
PKGNAME-lua= nginx-lua-${VERSION}
-PKGNAME-headers_more= nginx-headers-more-${VERSION}
-PKGNAME-perl= nginx-perl-${VERSION}
+PKGNAME-naxsi= nginx-naxsi-${VERSION}
PKGNAME-passenger= nginx-passenger-${VERSION}
+PKGNAME-perl= nginx-perl-${VERSION}
PKGNAME-rtmp= nginx-rtmp-${VERSION}
PKGNAME-securelink= nginx-securelink-${VERSION}
+PKGNAME-stream= nginx-stream-${VERSION}
+PKGNAME-xslt= nginx-xslt-${VERSION}
ONLY_FOR_ARCHS-passenger= aarch64 amd64 arm i386
@@ -46,14 +49,15 @@ MASTER_SITES1= https://raw.githubusercon
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
_GH_MODS= \
- openresty headers-more-nginx-module v0.33 \
- openresty lua-nginx-module v0.10.11 \
- nbs-system naxsi1.3 \
- kvspb nginx-auth-ldap 83c059b73566c2ee9cbda920d91b66657cf120b7 \
arut nginx-rtmp-module v${VERSION-rtmp} \
- simpl ngx_devel_kit v0.3.0 \
+ kvspb nginx-auth-ldap 83c059b73566c2ee9cbda920d91b66657cf120b7 \
leev ngx_http_geoip2_module 3.3 \
- nginx-modules ngx_http_hmac_secure_link_module 48c4625fbbf51ed5a95bfec23fa444f6c3702e50
+ nbs-system naxsi1.3 \
+ nginx njs0.7.4 \
+ nginx-modules ngx_http_hmac_secure_link_module 8c5449202cd5afd8970f316bd6828d28281dc9bc \
+ openresty headers-more-nginx-module v0.33 \
+ openresty lua-nginx-module v0.10.21 \
+ vision5 ngx_devel_kit v0.3.1
.for _a _p _c in ${_GH_MODS}
DISTFILES+= ${_p}-{${_a}/${_p}/archive/}${_c}.tar.gz:0
@@ -68,9 +72,9 @@ PERMIT_PACKAGE= Yes
MULTI_PACKAGES = -main -naxsi -perl ${MODULE_PACKAGES}
-MODULE_PACKAGES = -image_filter -geoip2 -xslt -mailproxy -stream \
- -passenger -headers_more -ldap_auth -lua -rtmp \
- -securelink
+MODULE_PACKAGES = -headers_more -geoip2 -image_filter \
+ -ldap_auth -lua -mailproxy -passenger \
+ -rtmp -securelink -stream -xslt
FLAVOR ?=
PSEUDO_FLAVORS = no_lua no_passenger
@@ -80,29 +84,30 @@ COMPILER = base-clang ports-gcc base-gc
.include
WANTLIB-main= c z pcre ssl crypto
-WANTLIB-mailproxy=
-WANTLIB-stream=
-WANTLIB-image_filter= gd
+WANTLIB-headers_more=
WANTLIB-geoip2= maxminddb
-WANTLIB-rtmp=
-WANTLIB-xslt= exslt xml2 xslt
-WANTLIB-naxsi=
+WANTLIB-image_filter= gd
WANTLIB-ldap_auth= ldap
+WANTLIB-mailproxy=
+WANTLIB-naxsi=
+WANTLIB-njs=
WANTLIB-lua= ${MODLUA_WANTLIB} m
-WANTLIB-headers_more=
WANTLIB-perl= c m perl
WANTLIB-passenger= m pthread ${COMPILER_LIBCXX}
+WANTLIB-rtmp=
WANTLIB-securelink= crypto
+WANTLIB-stream=
+WANTLIB-xslt= exslt xml2 xslt
LIB_DEPENDS-main= devel/pcre
-LIB_DEPENDS-xslt= textproc/libxml \
- textproc/libxslt
-LIB_DEPENDS-image_filter=graphics/gd
LIB_DEPENDS-geoip2= net/libmaxminddb
+LIB_DEPENDS-image_filter=graphics/gd
LIB_DEPENDS-ldap_auth= databases/openldap
LIB_DEPENDS-lua= ${MODLUA_LIB_DEPENDS}
LIB_DEPENDS-rtmp=
LIB_DEPENDS-securelink=
+LIB_DEPENDS-xslt= textproc/libxml \
+ textproc/libxslt
MODLUA_RUNDEP= No
RUN_DEPENDS= www/nginx,-main=${VERSION}
@@ -194,7 +199,7 @@ NO_TEST= Yes
ALL_TARGET=
pre-patch:
-.for i in headers-more-nginx-module lua-nginx-module naxsi \
+.for i in headers-more-nginx-module lua-nginx-module naxsi njs \
nginx-auth-ldap ngx_devel_kit ngx_http_geoip2_module \
ngx_http_hmac_secure_link_module
cd ${WRKSRC} && mv ../$i-* $i
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.79
diff -u -p -r1.79 distinfo
--- distinfo 30 May 2022 08:17:34 - 1.79
+++ distinfo 2 Jun 2022 19:38:52 -
@@ -1,20 +1,22 @@
SHA256 (headers-more-nginx-module-v0.33.tar.gz) = o9y6sRepwQO8HqUgD8AKe30q+X/3/VJfFvisJjLjD78=
-SHA256 (lua-nginx-module-v0.10.11.tar.gz) = wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY=
[PATCH] www/nginx: update third-party modules
Hi, here's the patch with the following updates: o) add njs - NGINX JavaScript module 0.7.4 o) sort knobs where it's possible o) update third-party modules to their recent versions Could you please review and commit these changes. Thank you. -- Sergey A. Osokin signature.asc Description: PGP signature
[PATCH] update www/unit to 1.27.0
Hi,
could you please review and commit the following patch.
Thank you.
--
Sergey A. Osokin
Index: Makefile.inc
===
RCS file: /cvs/ports/www/unit/Makefile.inc,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile.inc
--- Makefile.inc 11 Mar 2022 20:11:05 - 1.4
+++ Makefile.inc 2 Jun 2022 18:36:59 -
@@ -1,4 +1,4 @@
-VERSION?= 1.26.1
+VERSION?= 1.27.0
DISTNAME= unit-${VERSION}
CATEGORIES= www
Index: unit/distinfo
===
RCS file: /cvs/ports/www/unit/unit/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- unit/distinfo 6 Dec 2021 20:37:20 - 1.2
+++ unit/distinfo 2 Jun 2022 18:36:59 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.26.1.tar.gz) = /S2Vdu6SXfmzmbf+aZlrki+8Xkvch+bIxGqwOGT/hys=
-SIZE (unit-1.26.1.tar.gz) = 865811
+SHA256 (unit-1.27.0.tar.gz) = 36iC/390qh1ekqfC1xi9pixARhhuBNRlt8AoqzD9TmY=
+SIZE (unit-1.27.0.tar.gz) = 871783
Index: unit-perl/Makefile
===
RCS file: /cvs/ports/www/unit/unit-perl/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- unit-perl/Makefile 11 Mar 2022 20:11:05 - 1.2
+++ unit-perl/Makefile 2 Jun 2022 18:36:59 -
@@ -1,7 +1,5 @@
UNIT_MODNAME= perl
-REVISION= 0
-
WANTLIB= c m perl
MODULES= perl
Index: unit-perl/distinfo
===
RCS file: /cvs/ports/www/unit/unit-perl/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- unit-perl/distinfo 6 Dec 2021 20:37:21 - 1.2
+++ unit-perl/distinfo 2 Jun 2022 18:36:59 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.26.1.tar.gz) = /S2Vdu6SXfmzmbf+aZlrki+8Xkvch+bIxGqwOGT/hys=
-SIZE (unit-1.26.1.tar.gz) = 865811
+SHA256 (unit-1.27.0.tar.gz) = 36iC/390qh1ekqfC1xi9pixARhhuBNRlt8AoqzD9TmY=
+SIZE (unit-1.27.0.tar.gz) = 871783
Index: unit-php/Makefile
===
RCS file: /cvs/ports/www/unit/unit-php/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- unit-php/Makefile 7 Mar 2022 12:16:43 - 1.6
+++ unit-php/Makefile 2 Jun 2022 18:36:59 -
@@ -4,7 +4,6 @@ BROKEN-sparc64= compile check for php-em
UNIT_MODNAME= php${MODPHP_VERSION}
UNIT_SHORTNAME= ${FLAVOR}
-REVISION= 0
MODULES= lang/php
Index: unit-php/distinfo
===
RCS file: /cvs/ports/www/unit/unit-php/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- unit-php/distinfo 6 Dec 2021 20:37:21 - 1.2
+++ unit-php/distinfo 2 Jun 2022 18:36:59 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.26.1.tar.gz) = /S2Vdu6SXfmzmbf+aZlrki+8Xkvch+bIxGqwOGT/hys=
-SIZE (unit-1.26.1.tar.gz) = 865811
+SHA256 (unit-1.27.0.tar.gz) = 36iC/390qh1ekqfC1xi9pixARhhuBNRlt8AoqzD9TmY=
+SIZE (unit-1.27.0.tar.gz) = 871783
Index: unit-python/Makefile
===
RCS file: /cvs/ports/www/unit/unit-python/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- unit-python/Makefile 11 Mar 2022 20:11:05 - 1.2
+++ unit-python/Makefile 2 Jun 2022 18:36:59 -
@@ -1,8 +1,6 @@
UNIT_MODNAME= python${MODPY_VERSION}
UNIT_SHORTNAME= python
-REVISION= 0
-
MODULES+= lang/python
CONFIGURE_ENV+= PYTHON_CONFIG=${MODPY_BIN}-config
Index: unit-python/distinfo
===
RCS file: /cvs/ports/www/unit/unit-python/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- unit-python/distinfo 6 Dec 2021 20:37:21 - 1.2
+++ unit-python/distinfo 2 Jun 2022 18:36:59 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.26.1.tar.gz) = /S2Vdu6SXfmzmbf+aZlrki+8Xkvch+bIxGqwOGT/hys=
-SIZE (unit-1.26.1.tar.gz) = 865811
+SHA256 (unit-1.27.0.tar.gz) = 36iC/390qh1ekqfC1xi9pixARhhuBNRlt8AoqzD9TmY=
+SIZE (unit-1.27.0.tar.gz) = 871783
Index: unit-ruby/Makefile
===
RCS file: /cvs/ports/www/unit/unit-ruby/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- unit-ruby/Makefile 5 May 2022 15:41:58 - 1.3
+++ unit-ruby/Makefile 2 Jun 2022 18:36:59 -
@@ -1,8 +1,6 @@
UNIT_MODNAME= ruby${MODRUBY_REV}
UNIT_SHORTNAME= ruby
-REVISION= 1
-
MODULES+= lang/ruby
# XXX ruby port provide libruby30.so which is picked up in preference to
Index: unit-ruby/distinfo
===
RCS file: /cvs/ports/www/unit/unit-ruby/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- unit-ruby/distinfo 6 Dec 2021 20:37:21 - 1.2
+++ unit-ruby/distinfo 2 Jun 2022 18:36:59 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.26.1.tar.gz) = /S2Vdu6SXfmzmbf+aZlrki+8Xkvch+bIxGqwOGT/hys=
-SIZE (unit-1.26.1.tar.gz) = 865811
+SHA256 (unit-1.27.0.tar.gz) = 36iC/390qh1ekqfC1xi9pixARhhuBNRlt8AoqzD9TmY=
+SIZE (unit-1.27.0.tar.gz) = 871783
signature.asc
Description: PGP signature
Re: CVS: cvs.openbsd.org: ports
On Mon, Dec 06, 2021 at 01:37:21PM -0700, Stuart Henderson wrote: > CVSROOT: /cvs > Module name: ports > Changes by: st...@cvs.openbsd.org 2021/12/06 13:37:21 > > Modified files: > www/unit : Makefile.inc > www/unit/unit : Makefile distinfo > www/unit/unit-perl: distinfo > www/unit/unit-php: Makefile distinfo > www/unit/unit-python: distinfo > www/unit/unit-ruby: distinfo > > Log message: > update to NGINX Unit 1.26.1, from Sergey A. Osokin, ok sdk@ > > + fix build deps for unit-php Hey Stuart, thanks very much! -- Sergey A. Osokin signature.asc Description: PGP signature
Re: [PATCH] update www/unit to 1.26.1
Hi Stefan,
On Sun, Dec 05, 2021 at 01:59:03PM +0100, Stefan Hagen wrote:
> Sergey A. Osokin wrote:
> > could you please review and commit the attached patch to update
> > NGINX Unit to its recent bugfix release - 1.26.1.
> >
> > Here's the commit message:
> >
> >
> > www/unit: update from 1.26.0 to 1.26.1.
> >
> >
> >
> > *) Bugfix: occasionally, the Unit daemon was unable to fully terminate;
> >the bug had appeared in 1.26.0.
> >
> > *) Bugfix: a prototype process could crash on an application process
> >exit; the bug had appeared in 1.26.0.
> >
> > *) Bugfix: the router process crashed on reconfiguration if "access_log"
> >was configured without listeners.
> >
> > *) Bugfix: a segmentation fault occurred in the PHP module if chdir() or
> >fastcgi_finish_request() was called in the OPcache preloading script.
> >
> > *) Bugfix: fatal errors on DragonFly BSD; the bug had appeared in
> >1.26.0.
> >
> >
> >
> >
> > Thank you.
>
> It looks like unit-php is not built. But this is not new in this
> version. Therefore ok sdk@ for this diff, but unit-php should be looked
> at.
Unit's PHP module needs a PHP shared library, i.e. embedded feature,
otherwise it fails. sthen's recommendation was to do some improvements
in php ports.
> When php is not installed, unit-php does not pull it in, because php is
> only in RUN_DEPENDS.
>
> sthen already added MODPHP_BUILDDEP=Yes and I thought adding
> BUILD_DEPENDS=lang/php/${MODPHP_VERSION},-embed
> would fix the port. But it doesn't.
>
> $ make
> ===> unit-php74-1.26.1 depends on: php-embed-<7.5 - not found
> ===> Verifying install for php-embed-<7.5 in lang/php/7.4
> ===> Returning to build of unit-php74-1.26.1
> ===> unit-php74-1.26.1 depends on: php-embed-<7.5 - not found
> Dependency check failed
> *** Error 1 in . (/home/dpb/usr/ports/infrastructure/mk/bsd.port.mk:2276
> '/home/dpb/usr/ports/pobj/unit-php74-1.26.1-php74/.dep-lang-php-7.4,-embed')
> *** Error 2 in /usr/ports/www/unit/unit-php
> (/home/dpb/usr/ports/infrastructure/mk/bsd.port.mk:2594 'all':
> @lock=unit-php74-1.26.1; export ...)
>
> I have FETCH_PACKAGES set and it should have fetched "php-embed-7.4.26p2"
> or build it.
--
Sergey Osokin
signature.asc
Description: PGP signature
[PATCH] update www/unit to 1.26.1
Hi,
could you please review and commit the attached patch to update
NGINX Unit to its recent bugfix release - 1.26.1.
Here's the commit message:
www/unit: update from 1.26.0 to 1.26.1.
*) Bugfix: occasionally, the Unit daemon was unable to fully terminate;
the bug had appeared in 1.26.0.
*) Bugfix: a prototype process could crash on an application process
exit; the bug had appeared in 1.26.0.
*) Bugfix: the router process crashed on reconfiguration if "access_log"
was configured without listeners.
*) Bugfix: a segmentation fault occurred in the PHP module if chdir() or
fastcgi_finish_request() was called in the OPcache preloading script.
*) Bugfix: fatal errors on DragonFly BSD; the bug had appeared in
1.26.0.
Thank you.
--
Sergey Osokin
Index: Makefile.inc
===
RCS file: /cvs/ports/www/unit/Makefile.inc,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile.inc
--- Makefile.inc 22 Nov 2021 14:46:16 - 1.2
+++ Makefile.inc 2 Dec 2021 18:02:48 -
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.2 2021/11/22 14:46:16 sthen Exp $
-VERSION?= 1.26.0
+VERSION?= 1.26.1
DISTNAME= unit-${VERSION}
CATEGORIES= www
Index: unit/Makefile
===
RCS file: /cvs/ports/www/unit/unit/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- unit/Makefile 19 Nov 2021 10:01:02 - 1.1
+++ unit/Makefile 2 Dec 2021 18:02:48 -
@@ -2,8 +2,6 @@
COMMENT= dynamic web application server
-REVISION= 0
-
WANTLIB= c crypto m pcre2-8 pthread ssl
LIB_DEPENDS= devel/pcre2
Index: unit/distinfo
===
RCS file: /cvs/ports/www/unit/unit/distinfo,v
retrieving revision 1.1
diff -u -p -r1.1 distinfo
--- unit/distinfo 19 Nov 2021 10:01:02 - 1.1
+++ unit/distinfo 2 Dec 2021 18:02:48 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.26.0.tar.gz) = wEpAq4LsDVWFqZl6SEMX2J6VBECJ1y68yu3Shg3r9vw=
-SIZE (unit-1.26.0.tar.gz) = 865556
+SHA256 (unit-1.26.1.tar.gz) = /S2Vdu6SXfmzmbf+aZlrki+8Xkvch+bIxGqwOGT/hys=
+SIZE (unit-1.26.1.tar.gz) = 865811
Index: unit-perl/distinfo
===
RCS file: /cvs/ports/www/unit/unit-perl/distinfo,v
retrieving revision 1.1
diff -u -p -r1.1 distinfo
--- unit-perl/distinfo 19 Nov 2021 10:01:02 - 1.1
+++ unit-perl/distinfo 2 Dec 2021 18:02:48 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.26.0.tar.gz) = wEpAq4LsDVWFqZl6SEMX2J6VBECJ1y68yu3Shg3r9vw=
-SIZE (unit-1.26.0.tar.gz) = 865556
+SHA256 (unit-1.26.1.tar.gz) = /S2Vdu6SXfmzmbf+aZlrki+8Xkvch+bIxGqwOGT/hys=
+SIZE (unit-1.26.1.tar.gz) = 865811
Index: unit-php/distinfo
===
RCS file: /cvs/ports/www/unit/unit-php/distinfo,v
retrieving revision 1.1
diff -u -p -r1.1 distinfo
--- unit-php/distinfo 19 Nov 2021 10:01:02 - 1.1
+++ unit-php/distinfo 2 Dec 2021 18:02:48 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.26.0.tar.gz) = wEpAq4LsDVWFqZl6SEMX2J6VBECJ1y68yu3Shg3r9vw=
-SIZE (unit-1.26.0.tar.gz) = 865556
+SHA256 (unit-1.26.1.tar.gz) = /S2Vdu6SXfmzmbf+aZlrki+8Xkvch+bIxGqwOGT/hys=
+SIZE (unit-1.26.1.tar.gz) = 865811
Index: unit-python/distinfo
===
RCS file: /cvs/ports/www/unit/unit-python/distinfo,v
retrieving revision 1.1
diff -u -p -r1.1 distinfo
--- unit-python/distinfo 19 Nov 2021 10:01:02 - 1.1
+++ unit-python/distinfo 2 Dec 2021 18:02:48 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.26.0.tar.gz) = wEpAq4LsDVWFqZl6SEMX2J6VBECJ1y68yu3Shg3r9vw=
-SIZE (unit-1.26.0.tar.gz) = 865556
+SHA256 (unit-1.26.1.tar.gz) = /S2Vdu6SXfmzmbf+aZlrki+8Xkvch+bIxGqwOGT/hys=
+SIZE (unit-1.26.1.tar.gz) = 865811
Index: unit-ruby/distinfo
===
RCS file: /cvs/ports/www/unit/unit-ruby/distinfo,v
retrieving revision 1.1
diff -u -p -r1.1 distinfo
--- unit-ruby/distinfo 19 Nov 2021 10:01:03 - 1.1
+++ unit-ruby/distinfo 2 Dec 2021 18:02:48 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.26.0.tar.gz) = wEpAq4LsDVWFqZl6SEMX2J6VBECJ1y68yu3Shg3r9vw=
-SIZE (unit-1.26.0.tar.gz) = 865556
+SHA256 (unit-1.26.1.tar.gz) = /S2Vdu6SXfmzmbf+aZlrki+8Xkvch+bIxGqwOGT/hys=
+SIZE (unit-1.26.1.tar.gz) = 865811
signature.asc
Description: PGP signature
Re: [PATCH] update www/unit to 1.26.0
On Thu, Nov 18, 2021 at 11:28:27PM +, Sergey A. Osokin wrote: > > > What do you think Sergey, does this arrangement work for you? > > It looks fantastic and works well to me! Official documentation on the https://unit.nginx.org/ has been updated recently, it contains OpenBSD staff now, please visit https://unit.nginx.org/installation/#community-openbsd Please let me know if you any updates/concerns on that. Thank you! -- Sergey Osokin signature.asc Description: PGP signature
Re: [PATCH] update www/unit to 1.26.0
Hi Stuart, thanks very much for the update. On Thu, Nov 18, 2021 at 09:59:43PM +, Stuart Henderson wrote: > On 2021/11/18 21:54, Stuart Henderson wrote: > > On 2021/11/18 19:45, Stuart Henderson wrote: > > > I have PHP working but need to do a bit of reorganisation to handle > > > building multiple versions, I'll mail you later > > > > I've attached this as a tar.gz. (I think this will be easier to read > > than a diff due to the reorganised directory layout). > > > > What do you think Sergey, does this arrangement work for you? It looks fantastic and works well to me! > > I've loosely based some of the changes on what's in FreeBSD ports but > > we don't have the "master port" concept and use multi-level > > directories to similar effect. > > > > Setup for tests is a little messier now that the modules are built in > > separate ports, but it works and I think it's good enough. (We plan to > > update pytest but need to deal with remaining Python 2.x ports using it > > first - I am testing with a locally updated pytest and related ports). That sounds also great to me! > Now with attachment :) -- Sergey Osokin signature.asc Description: PGP signature
Re: [PATCH] update www/unit to 1.26.0
Hi Omar,
hope you're doing well.
On Thu, Nov 18, 2021 at 06:34:08PM +0100, Omar Polo wrote:
> "Sergey A. Osokin" writes:
>
> > here's the maintainer update for www/unit port, could
> > you please review and commit.
>
> I think the REVISION-python should be dropped since we're bumping the
> version. `make port-lib-depends-check` still complains about extra
> WANTLIB for -ruby :/
>
> Regarding the tests there seem to be slightly more failures.
>
> With the current version:
> > 69 failed, 366 passed, 265 skipped, 144 error in 362.32 seconds
> and after the update:
> > 79 failed, 316 passed, 274 skipped, 273 error in 345.81 seconds
The NGINX Unit test suite is based on the recent version of pytest
framework, so we'd need to update devel/py-test first.
> but I don't run this so I don't know the real impact of these numbers;
> I've tested only for curiosity and because I spotted the REVISION-python
> in the context of the diff ;)
[...]
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/www/unit/Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile
> --- Makefile 2 Nov 2021 00:02:57 - 1.3
> +++ Makefile 18 Nov 2021 17:33:55 -
> @@ -5,9 +5,8 @@ COMMENT-perl= NGINX Unit perl module
> COMMENT-python= NGINX Unit python module
> COMMENT-ruby=NGINX Unit ruby module
>
> -VERSION= 1.25.0
> +VERSION= 1.26.0
> DISTNAME=unit-${VERSION}
> -REVISION-python= 0
>
> PKGNAME-main=${DISTNAME}
> PKGNAME-perl=unit-perl-${VERSION}
> Index: distinfo
> ===
> RCS file: /home/cvs/ports/www/unit/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- distinfo 23 Oct 2021 16:02:51 - 1.1.1.1
> +++ distinfo 18 Nov 2021 17:33:59 -
> @@ -1,2 +1,2 @@
> -SHA256 (unit-1.25.0.tar.gz) = SrTwWpNN0AYowOBn99DFumK7Veni56Mz+jdkoYC5dl0=
> -SIZE (unit-1.25.0.tar.gz) = 853280
> +SHA256 (unit-1.26.0.tar.gz) = wEpAq4LsDVWFqZl6SEMX2J6VBECJ1y68yu3Shg3r9vw=
> +SIZE (unit-1.26.0.tar.gz) = 865556
Brilliant!
--
Sergey Osokin
>
signature.asc
Description: PGP signature
[PATCH] update www/unit to 1.26.0
Hi,
here's the maintainer update for www/unit port, could
you please review and commit.
Thank you.
--
Sergey Osokin
Index: Makefile
===
RCS file: /cvs/ports/www/unit/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 2 Nov 2021 00:02:57 - 1.3
+++ Makefile 18 Nov 2021 17:25:15 -
@@ -5,7 +5,7 @@ COMMENT-perl= NGINX Unit perl module
COMMENT-python= NGINX Unit python module
COMMENT-ruby= NGINX Unit ruby module
-VERSION= 1.25.0
+VERSION= 1.26.0
DISTNAME= unit-${VERSION}
REVISION-python= 0
Index: distinfo
===
RCS file: /cvs/ports/www/unit/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 23 Oct 2021 16:02:51 - 1.1.1.1
+++ distinfo 18 Nov 2021 17:25:15 -
@@ -1,2 +1,2 @@
-SHA256 (unit-1.25.0.tar.gz) = SrTwWpNN0AYowOBn99DFumK7Veni56Mz+jdkoYC5dl0=
-SIZE (unit-1.25.0.tar.gz) = 853280
+SHA256 (unit-1.26.0.tar.gz) = wEpAq4LsDVWFqZl6SEMX2J6VBECJ1y68yu3Shg3r9vw=
+SIZE (unit-1.26.0.tar.gz) = 865556
signature.asc
Description: PGP signature
Re: [PATCH] update www/nginx to 1.20.2
On Tue, Nov 16, 2021 at 08:14:56PM +0100, Robert Nagy wrote: > commited, thanks Thanks, Robert! I sent a patch to add NJS, NGINX Javascript module to the www/nginx port last month, Oct 26th. Could you please help me with review of the patch. -- Sergey Osokin signature.asc Description: PGP signature
Re: [PATCH] update www/nginx to 1.20.2
Hi Robert,
good point! Updated and attached, thanks!
On Tue, Nov 16, 2021 at 07:07:19PM +0100, Robert Nagy wrote:
> you are missing the REVISION changes / removals from the Makefile
>
> On 16/11/21 17:38 +0000, Sergey A. Osokin wrote:
> > and here's the commit log.
> >
> > On Tue, Nov 16, 2021 at 05:35:33PM +, Sergey A. Osokin wrote:
> > > Hello,
> > >
> > > hope you're doing well.
> > > Here's the patch to update www/nginx to its recent stable version.
> > > Thanks.
--
Sergey Osokin
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.156
diff -u -p -r1.156 Makefile
--- Makefile 10 Sep 2021 15:19:00 - 1.156
+++ Makefile 16 Nov 2021 18:22:01 -
@@ -17,13 +17,10 @@ COMMENT-passenger= nginx passenger (ruby
COMMENT-rtmp= nginx module for RTMP streaming
COMMENT-securelink= nginx HMAC secure link module
-VERSION= 1.20.1
+VERSION= 1.20.2
DISTNAME= nginx-${VERSION}
CATEGORIES= www
-REVISION-lua= 0
-REVISION-passenger= 0
-
VERSION-rtmp= 1.2.1
PKGNAME-main= ${DISTNAME}
@@ -40,8 +37,6 @@ PKGNAME-perl= nginx-perl-${VERSION}
PKGNAME-passenger= nginx-passenger-${VERSION}
PKGNAME-rtmp= nginx-rtmp-${VERSION}
PKGNAME-securelink= nginx-securelink-${VERSION}
-
-REVISION-main= 0
ONLY_FOR_ARCHS-passenger= aarch64 amd64 arm i386
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.77
diff -u -p -r1.77 distinfo
--- distinfo 25 May 2021 19:43:55 - 1.77
+++ distinfo 16 Nov 2021 18:22:01 -
@@ -2,7 +2,7 @@ SHA256 (headers-more-nginx-module-v0.33.
SHA256 (lua-nginx-module-v0.10.11.tar.gz) = wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY=
SHA256 (naxsi-1.3.tar.gz) = Q5yGdzctJZe0Ngu8wQvIZJDeH8dWlbGTrV3xVKIU1ig=
SHA256 (nginx-1.20.1-chroot.patch) = SS1TB0j8N4/dn5pUTGT6WvkN3aAUuKz5+R0Nt+MG0gk=
-SHA256 (nginx-1.20.1.tar.gz) = 5GLhFTPVwwuqBd92UhYP9ZeVkdKRc2z6Xtuf0u20jEk=
+SHA256 (nginx-1.20.2.tar.gz) = lYh2dXeCGQoWU+FNwm38e6Jj3jEOBMET4R6X0b70WkI=
SHA256 (nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) = aQxOW9sq4ZsP7nXNNW0YATRo20cmFrYJeloLvjRshGQ=
SHA256 (nginx-rtmp-module-v1.2.1.tar.gz) = h6pZdACwtaBSdO4tI9jLgiThJoYiegq+MdeDs6ZF6jc=
SHA256 (ngx_devel_kit-v0.3.0.tar.gz) = iOBamainQZBm9a51lm+x78QJutRSLRSYbaB0VUrmFhk=
@@ -12,7 +12,7 @@ SIZE (headers-more-nginx-module-v0.33.ta
SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
SIZE (naxsi-1.3.tar.gz) = 235626
SIZE (nginx-1.20.1-chroot.patch) = 8783
-SIZE (nginx-1.20.1.tar.gz) = 1061461
+SIZE (nginx-1.20.2.tar.gz) = 1062124
SIZE (nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) = 18542
SIZE (nginx-rtmp-module-v1.2.1.tar.gz) = 519919
SIZE (ngx_devel_kit-v0.3.0.tar.gz) = 66455
signature.asc
Description: PGP signature
Re: [PATCH] update www/nginx to 1.20.2
and here's the commit log.
On Tue, Nov 16, 2021 at 05:35:33PM +, Sergey A. Osokin wrote:
> Hello,
>
> hope you're doing well.
> Here's the patch to update www/nginx to its recent stable version.
> Thanks.
>
> --
> Sergey Osokin
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/nginx/Makefile,v
> retrieving revision 1.156
> diff -u -p -r1.156 Makefile
> --- Makefile 10 Sep 2021 15:19:00 - 1.156
> +++ Makefile 16 Nov 2021 17:33:58 -
> @@ -17,7 +17,7 @@ COMMENT-passenger= nginx passenger (ruby
> COMMENT-rtmp=nginx module for RTMP streaming
> COMMENT-securelink= nginx HMAC secure link module
>
> -VERSION= 1.20.1
> +VERSION= 1.20.2
> DISTNAME=nginx-${VERSION}
> CATEGORIES= www
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/nginx/distinfo,v
> retrieving revision 1.77
> diff -u -p -r1.77 distinfo
> --- distinfo 25 May 2021 19:43:55 - 1.77
> +++ distinfo 16 Nov 2021 17:33:58 -
> @@ -2,7 +2,7 @@ SHA256 (headers-more-nginx-module-v0.33.
> SHA256 (lua-nginx-module-v0.10.11.tar.gz) =
> wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY=
> SHA256 (naxsi-1.3.tar.gz) = Q5yGdzctJZe0Ngu8wQvIZJDeH8dWlbGTrV3xVKIU1ig=
> SHA256 (nginx-1.20.1-chroot.patch) =
> SS1TB0j8N4/dn5pUTGT6WvkN3aAUuKz5+R0Nt+MG0gk=
> -SHA256 (nginx-1.20.1.tar.gz) = 5GLhFTPVwwuqBd92UhYP9ZeVkdKRc2z6Xtuf0u20jEk=
> +SHA256 (nginx-1.20.2.tar.gz) = lYh2dXeCGQoWU+FNwm38e6Jj3jEOBMET4R6X0b70WkI=
> SHA256 (nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) =
> aQxOW9sq4ZsP7nXNNW0YATRo20cmFrYJeloLvjRshGQ=
> SHA256 (nginx-rtmp-module-v1.2.1.tar.gz) =
> h6pZdACwtaBSdO4tI9jLgiThJoYiegq+MdeDs6ZF6jc=
> SHA256 (ngx_devel_kit-v0.3.0.tar.gz) =
> iOBamainQZBm9a51lm+x78QJutRSLRSYbaB0VUrmFhk=
> @@ -12,7 +12,7 @@ SIZE (headers-more-nginx-module-v0.33.ta
> SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
> SIZE (naxsi-1.3.tar.gz) = 235626
> SIZE (nginx-1.20.1-chroot.patch) = 8783
> -SIZE (nginx-1.20.1.tar.gz) = 1061461
> +SIZE (nginx-1.20.2.tar.gz) = 1062124
> SIZE (nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) =
> 18542
> SIZE (nginx-rtmp-module-v1.2.1.tar.gz) = 519919
> SIZE (ngx_devel_kit-v0.3.0.tar.gz) = 66455
www/nginx: update to 1.20.2.
*) Feature: OpenSSL 3.0 compatibility.
*) Bugfix: SSL variables might be empty when used in logs; the bug had
appeared in 1.19.5.
*) Bugfix: keepalive connections with gRPC backends might not be closed
after receiving a GOAWAY frame.
*) Bugfix: backend SSL connections in the stream module might hang after
an SSL handshake.
*) Bugfix: SSL connections with gRPC backends might hang if select,
poll, or /dev/poll methods were used.
*) Bugfix: in the $content_length variable when using chunked transfer
encoding.
*) Bugfix: requests might hang when using HTTP/2 and the "aio_write"
directive.
signature.asc
Description: PGP signature
[PATCH] update www/nginx to 1.20.2
Hello,
hope you're doing well.
Here's the patch to update www/nginx to its recent stable version.
Thanks.
--
Sergey Osokin
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.156
diff -u -p -r1.156 Makefile
--- Makefile 10 Sep 2021 15:19:00 - 1.156
+++ Makefile 16 Nov 2021 17:33:58 -
@@ -17,7 +17,7 @@ COMMENT-passenger= nginx passenger (ruby
COMMENT-rtmp= nginx module for RTMP streaming
COMMENT-securelink= nginx HMAC secure link module
-VERSION= 1.20.1
+VERSION= 1.20.2
DISTNAME= nginx-${VERSION}
CATEGORIES= www
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.77
diff -u -p -r1.77 distinfo
--- distinfo 25 May 2021 19:43:55 - 1.77
+++ distinfo 16 Nov 2021 17:33:58 -
@@ -2,7 +2,7 @@ SHA256 (headers-more-nginx-module-v0.33.
SHA256 (lua-nginx-module-v0.10.11.tar.gz) = wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY=
SHA256 (naxsi-1.3.tar.gz) = Q5yGdzctJZe0Ngu8wQvIZJDeH8dWlbGTrV3xVKIU1ig=
SHA256 (nginx-1.20.1-chroot.patch) = SS1TB0j8N4/dn5pUTGT6WvkN3aAUuKz5+R0Nt+MG0gk=
-SHA256 (nginx-1.20.1.tar.gz) = 5GLhFTPVwwuqBd92UhYP9ZeVkdKRc2z6Xtuf0u20jEk=
+SHA256 (nginx-1.20.2.tar.gz) = lYh2dXeCGQoWU+FNwm38e6Jj3jEOBMET4R6X0b70WkI=
SHA256 (nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) = aQxOW9sq4ZsP7nXNNW0YATRo20cmFrYJeloLvjRshGQ=
SHA256 (nginx-rtmp-module-v1.2.1.tar.gz) = h6pZdACwtaBSdO4tI9jLgiThJoYiegq+MdeDs6ZF6jc=
SHA256 (ngx_devel_kit-v0.3.0.tar.gz) = iOBamainQZBm9a51lm+x78QJutRSLRSYbaB0VUrmFhk=
@@ -12,7 +12,7 @@ SIZE (headers-more-nginx-module-v0.33.ta
SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
SIZE (naxsi-1.3.tar.gz) = 235626
SIZE (nginx-1.20.1-chroot.patch) = 8783
-SIZE (nginx-1.20.1.tar.gz) = 1061461
+SIZE (nginx-1.20.2.tar.gz) = 1062124
SIZE (nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) = 18542
SIZE (nginx-rtmp-module-v1.2.1.tar.gz) = 519919
SIZE (ngx_devel_kit-v0.3.0.tar.gz) = 66455
signature.asc
Description: PGP signature
Re: [PATCH] add njs module to www/nginx
Here's the updated version of the patch with pkg/PLIST-njs and
pkg/DESCR-njs files.
On Sat, Oct 23, 2021 at 02:52:35AM +, Sergey A. Osokin wrote:
> Hi,
>
> here the patch to add NGINX Javascript (njs) module to www/nginx port.
> Please let me know if you have any questions.
>
> Thank you.
>
> --
> Sergey Osokin
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/nginx/Makefile,v
> retrieving revision 1.156
> diff -u -p -r1.156 Makefile
> --- Makefile 10 Sep 2021 15:19:00 - 1.156
> +++ Makefile 23 Oct 2021 02:48:39 -
> @@ -13,6 +13,7 @@ COMMENT-ldap_auth= nginx LDAP authentica
> COMMENT-lua= nginx lua scripting module
> COMMENT-headers_more=nginx module for setting/adding/clearing headers
> COMMENT-perl=nginx perl scripting module
> +COMMENT-njs= nginx javascript scripting module
> COMMENT-passenger= nginx passenger (ruby/python/nodejs) integration module
> COMMENT-rtmp=nginx module for RTMP streaming
> COMMENT-securelink= nginx HMAC secure link module
> @@ -24,6 +25,7 @@ CATEGORIES= www
> REVISION-lua=0
> REVISION-passenger= 0
>
> +VERSION-njs= 0.7.0
> VERSION-rtmp=1.2.1
>
> PKGNAME-main=${DISTNAME}
> @@ -37,6 +39,7 @@ PKGNAME-ldap_auth= nginx-ldap_auth-${VER
> PKGNAME-lua= nginx-lua-${VERSION}
> PKGNAME-headers_more=nginx-headers-more-${VERSION}
> PKGNAME-perl=nginx-perl-${VERSION}
> +PKGNAME-njs= nginx-njs-${VERSION}
> PKGNAME-passenger= nginx-passenger-${VERSION}
> PKGNAME-rtmp=nginx-rtmp-${VERSION}
> PKGNAME-securelink= nginx-securelink-${VERSION}
> @@ -58,6 +61,7 @@ _GH_MODS= \
> nbs-system naxsi 1.3 \
> kvspb nginx-auth-ldap
> 83c059b73566c2ee9cbda920d91b66657cf120b7 \
> arutnginx-rtmp-module v${VERSION-rtmp} \
> + nginx njs ${VERSION-njs} \
> simpl ngx_devel_kit v0.3.0 \
> leevngx_http_geoip2_module 3.3 \
> nginx-modules ngx_http_hmac_secure_link_module
> 48c4625fbbf51ed5a95bfec23fa444f6c3702e50
> @@ -76,8 +80,8 @@ PERMIT_PACKAGE= Yes
> MULTI_PACKAGES = -main -naxsi -perl ${MODULE_PACKAGES}
>
> MODULE_PACKAGES =-image_filter -geoip2 -xslt -mailproxy -stream \
> - -passenger -headers_more -ldap_auth -lua -rtmp \
> - -securelink
> + -passenger -headers_more -ldap_auth -lua -njs \
> + -rtmp -securelink
>
> FLAVOR ?=
> PSEUDO_FLAVORS = no_lua no_passenger
> @@ -92,6 +96,7 @@ WANTLIB-stream=
> WANTLIB-image_filter=gd
> WANTLIB-geoip2= maxminddb
> WANTLIB-rtmp=
> +WANTLIB-njs=
> WANTLIB-xslt=exslt xml2 xslt
> WANTLIB-naxsi=
> WANTLIB-ldap_auth= ldap
> @@ -109,6 +114,7 @@ LIB_DEPENDS-geoip2= net/libmaxminddb
> LIB_DEPENDS-ldap_auth= databases/openldap
> LIB_DEPENDS-lua= ${MODLUA_LIB_DEPENDS}
> LIB_DEPENDS-rtmp=
> +LIB_DEPENDS-njs=
> LIB_DEPENDS-securelink=
>
> MODLUA_RUNDEP= No
> @@ -158,6 +164,10 @@ CONFIGURE_ARGS+= --add-dynamic-module=${
>
> .if ${BUILD_PACKAGES:M-rtmp}
> CONFIGURE_ARGS+=
> --add-dynamic-module=${WRKDIR}/nginx-rtmp-module-${VERSION-rtmp}/
> +.endif
> +
> +.if ${BUILD_PACKAGES:M-njs}
> +CONFIGURE_ARGS+= --add-dynamic-module=${WRKDIR}/njs-${VERSION-njs}/nginx
> .endif
>
> CONFIGURE_ARGS+= --prefix=${NGINX_DIR} \
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/nginx/distinfo,v
> retrieving revision 1.77
> diff -u -p -r1.77 distinfo
> --- distinfo 25 May 2021 19:43:55 - 1.77
> +++ distinfo 23 Oct 2021 02:48:39 -
> @@ -8,6 +8,7 @@ SHA256 (nginx-rtmp-module-v1.2.1.tar.gz)
> SHA256 (ngx_devel_kit-v0.3.0.tar.gz) =
> iOBamainQZBm9a51lm+x78QJutRSLRSYbaB0VUrmFhk=
> SHA256 (ngx_http_geoip2_module-3.3.tar.gz) =
> QTeEOMgz4xOhiGnQxKcnBLSDXDCsr3/WgBOrZzL/eKc=
> SHA256
> (ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz)
> = ZXpA2rODS1enIREzlD1OqWwpWcv3NOUXH4eUOgOAmqg=
> +SHA256 (njs-0.7.0.tar.gz) = Pw/n13YAqcVAAM4QHdUfRIEZZFAmQa5QXjjBu/WV5vE=
> SIZE (headers-more-nginx-module-v0.33.tar.gz) = 28130
> SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
> SIZE (naxsi-1.3.tar.gz) = 235626
> @@ -18,3 +19,4 @@ SIZE (nginx-rtmp-module-v1.2.1.tar.gz) =
> SIZE (ngx_devel_kit-v0.3.0.tar.g
[PATCH] add njs module to www/nginx
Hi,
here the patch to add NGINX Javascript (njs) module to www/nginx port.
Please let me know if you have any questions.
Thank you.
--
Sergey Osokin
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.156
diff -u -p -r1.156 Makefile
--- Makefile10 Sep 2021 15:19:00 - 1.156
+++ Makefile23 Oct 2021 02:48:39 -
@@ -13,6 +13,7 @@ COMMENT-ldap_auth=nginx LDAP authentica
COMMENT-lua= nginx lua scripting module
COMMENT-headers_more= nginx module for setting/adding/clearing headers
COMMENT-perl= nginx perl scripting module
+COMMENT-njs= nginx javascript scripting module
COMMENT-passenger= nginx passenger (ruby/python/nodejs) integration module
COMMENT-rtmp= nginx module for RTMP streaming
COMMENT-securelink=nginx HMAC secure link module
@@ -24,6 +25,7 @@ CATEGORIES= www
REVISION-lua= 0
REVISION-passenger=0
+VERSION-njs= 0.7.0
VERSION-rtmp= 1.2.1
PKGNAME-main= ${DISTNAME}
@@ -37,6 +39,7 @@ PKGNAME-ldap_auth=nginx-ldap_auth-${VER
PKGNAME-lua= nginx-lua-${VERSION}
PKGNAME-headers_more= nginx-headers-more-${VERSION}
PKGNAME-perl= nginx-perl-${VERSION}
+PKGNAME-njs= nginx-njs-${VERSION}
PKGNAME-passenger= nginx-passenger-${VERSION}
PKGNAME-rtmp= nginx-rtmp-${VERSION}
PKGNAME-securelink=nginx-securelink-${VERSION}
@@ -58,6 +61,7 @@ _GH_MODS= \
nbs-system naxsi 1.3 \
kvspb nginx-auth-ldap
83c059b73566c2ee9cbda920d91b66657cf120b7 \
arutnginx-rtmp-module v${VERSION-rtmp} \
+ nginx njs ${VERSION-njs} \
simpl ngx_devel_kit v0.3.0 \
leevngx_http_geoip2_module 3.3 \
nginx-modules ngx_http_hmac_secure_link_module
48c4625fbbf51ed5a95bfec23fa444f6c3702e50
@@ -76,8 +80,8 @@ PERMIT_PACKAGE= Yes
MULTI_PACKAGES = -main -naxsi -perl ${MODULE_PACKAGES}
MODULE_PACKAGES = -image_filter -geoip2 -xslt -mailproxy -stream \
- -passenger -headers_more -ldap_auth -lua -rtmp \
- -securelink
+ -passenger -headers_more -ldap_auth -lua -njs \
+ -rtmp -securelink
FLAVOR ?=
PSEUDO_FLAVORS = no_lua no_passenger
@@ -92,6 +96,7 @@ WANTLIB-stream=
WANTLIB-image_filter= gd
WANTLIB-geoip2=maxminddb
WANTLIB-rtmp=
+WANTLIB-njs=
WANTLIB-xslt= exslt xml2 xslt
WANTLIB-naxsi=
WANTLIB-ldap_auth= ldap
@@ -109,6 +114,7 @@ LIB_DEPENDS-geoip2= net/libmaxminddb
LIB_DEPENDS-ldap_auth= databases/openldap
LIB_DEPENDS-lua= ${MODLUA_LIB_DEPENDS}
LIB_DEPENDS-rtmp=
+LIB_DEPENDS-njs=
LIB_DEPENDS-securelink=
MODLUA_RUNDEP= No
@@ -158,6 +164,10 @@ CONFIGURE_ARGS+= --add-dynamic-module=${
.if ${BUILD_PACKAGES:M-rtmp}
CONFIGURE_ARGS+=
--add-dynamic-module=${WRKDIR}/nginx-rtmp-module-${VERSION-rtmp}/
+.endif
+
+.if ${BUILD_PACKAGES:M-njs}
+CONFIGURE_ARGS+= --add-dynamic-module=${WRKDIR}/njs-${VERSION-njs}/nginx
.endif
CONFIGURE_ARGS+= --prefix=${NGINX_DIR} \
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.77
diff -u -p -r1.77 distinfo
--- distinfo25 May 2021 19:43:55 - 1.77
+++ distinfo23 Oct 2021 02:48:39 -
@@ -8,6 +8,7 @@ SHA256 (nginx-rtmp-module-v1.2.1.tar.gz)
SHA256 (ngx_devel_kit-v0.3.0.tar.gz) =
iOBamainQZBm9a51lm+x78QJutRSLRSYbaB0VUrmFhk=
SHA256 (ngx_http_geoip2_module-3.3.tar.gz) =
QTeEOMgz4xOhiGnQxKcnBLSDXDCsr3/WgBOrZzL/eKc=
SHA256
(ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz)
= ZXpA2rODS1enIREzlD1OqWwpWcv3NOUXH4eUOgOAmqg=
+SHA256 (njs-0.7.0.tar.gz) = Pw/n13YAqcVAAM4QHdUfRIEZZFAmQa5QXjjBu/WV5vE=
SIZE (headers-more-nginx-module-v0.33.tar.gz) = 28130
SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
SIZE (naxsi-1.3.tar.gz) = 235626
@@ -18,3 +19,4 @@ SIZE (nginx-rtmp-module-v1.2.1.tar.gz) =
SIZE (ngx_devel_kit-v0.3.0.tar.gz) = 66455
SIZE (ngx_http_geoip2_module-3.3.tar.gz) = 8509
SIZE
(ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz)
= 6159
+SIZE (njs-0.7.0.tar.gz) = 575477
signature.asc
Description: PGP signature
Re: [NEW] www/unit
Hi Stuart, thank you very much for the review and updates. On Mon, Oct 11, 2021 at 10:25:57PM +0100, Stuart Henderson wrote: [...] > Hi Sergey. Updated version attached, A few notes on my changes, there > are probably some others too but this is what I remember: > > - reduce unnecessary variables, the UNIT_xxx were only used to pass > to configure and create directories in fake-install. The directory > creation is pointless, so I dropped the variables and passed directly > to configure. > > - move libexec to lib. openbsd standard use for libexec is for > executables invoked by some software. other similar ports use lib for > plugin modules. > > - /var/run and tmp are cleared at boot so must be created by the rc > script, I added rc_pre. there is no point including them in the package > because it gives a false sense that things will work after boot. > > - tidy dependencies > > - use a valid uid for @newuser/@newgroup lines > > - enable tests > > A couple of issues remain: > > - ruby linkage looks a bit wrong, but I think that's on the ruby side > not the unit side. the NEEDED ELF header in unit's ruby module is set to > just "libruby30.so" and not "libruby30.so.0.0", I think this is probably > due to the symlink in /usr/local/lib/libruby30.so -> libruby30.so.0.0 > and/or lack of SONAME in libruby30. Maybe another porter has an idea > what to do with this though I think it's probably not a show-stopper.. > > - rc script nearly duplicates the standard rc_stop section but adds > -QUIT instead of using the default (-TERM). currently the two singals > do the same in unit anyway but comments suggest it is intended for a > graceful shutdown (not yet implemented). I don't think that will work > very well with rc.d anyway (rcctl restart will wait for shutdown, > so you either use 'fast shutdown' and kill active connections, or > use 'graceful' and have a gap while you stop accepting new connections > while draining old). So I think it might be better to drop the rc_stop > function. Will take a look on that and let you know, thank you so much. Two more questions from my side: - the first one is related to support of different versions of programming languages: i.e. lang/python supports three versions, 2.7, 3.8, and 3.9. It's a bit unclear how to implement that, so I need your guidance here; - NGINX Unit supports PHP as well, to compile a corresponding NGINX Unit's module a shared library support needs to be enabled. That's the `--enable-embed' configure option for php, and a couple of files will be installed, a header file and a shared library. > Other than those, it builds and starts ok, I have run out of patience > trying to figure out how to configure to test runtime myself though > (I was looking for a simple static-file config but there is nothing > obvious). However the tests that I've enabled look promising (a couple > of F/E in test_perl_application.py and test_respawn.py, and a couple > of TLS-related ones, looks fairly minor). NGINX Unit has an excellent tests suite and that one based on a recent version of pytest. There's no static-file config, but it's possible to talk to NGINX Unit through a control socket in JSON format. -- Sergey Osokin signature.asc Description: PGP signature
Re: [NEW] www/unit
On Wed, Oct 06, 2021 at 03:30:08AM +, Sergey A. Osokin wrote: > On Wed, Sep 22, 2021 at 08:49:06PM +0100, Stuart Henderson wrote: > > On 2021/09/22 13:34, Sergey A. Osokin wrote: > > > On Fri, Sep 17, 2021 at 03:20:16PM +, Sergey A. Osokin wrote: > > > > > > P.S. Yes, I know you're busy with a preparation to the upcoming 7.0 > > > and it's good time for fixes and probably not a best time for new > > > ports, but I want to let you know that www/unit builds very well > > > with new and shiny 7.0 yesterday snapshot. > > > > yes, it's been no new imports for a week already. > > I will have a look again when I have time. > > Seems like a liveness probe returns a positive signal after the > ports change freeze for the upcoming 7.0. > Is there any update? Could you please provide an update. Thank you. -- Sergey Osokin signature.asc Description: PGP signature
Re: [NEW] www/unit
On Wed, Sep 22, 2021 at 08:49:06PM +0100, Stuart Henderson wrote: > On 2021/09/22 13:34, Sergey A. Osokin wrote: > > On Fri, Sep 17, 2021 at 03:20:16PM +0000, Sergey A. Osokin wrote: > > > > P.S. Yes, I know you're busy with a preparation to the upcoming 7.0 > > and it's good time for fixes and probably not a best time for new > > ports, but I want to let you know that www/unit builds very well > > with new and shiny 7.0 yesterday snapshot. > > yes, it's been no new imports for a week already. > I will have a look again when I have time. Seems like a liveness probe returns a positive signal after the ports change freeze for the upcoming 7.0. Is there any update? Thank you. -- Sergey Osokin signature.asc Description: PGP signature
Re: [NEW] www/unit
Hi, On Fri, Sep 17, 2021 at 03:20:16PM +, Sergey A. Osokin wrote: [...] > > Updated the port followed by suggestions, could please take a look. > > And one more. Could you please provide an update. P.S. Yes, I know you're busy with a preparation to the upcoming 7.0 and it's good time for fixes and probably not a best time for new ports, but I want to let you know that www/unit builds very well with new and shiny 7.0 yesterday snapshot. Thank you. -- Sergey Osokin signature.asc Description: PGP signature
Re: [NEW] www/unit
On Thu, Sep 16, 2021 at 11:13:40PM +, Sergey A. Osokin wrote:
> On Thu, Sep 16, 2021 at 05:02:15PM +0000, Sergey A. Osokin wrote:
> > On Thu, Sep 16, 2021 at 05:47:19PM +0100, Stuart Henderson wrote:
> > > On 2021/09/16 16:05, Sergey A. Osokin wrote:
> > > > On Thu, Sep 16, 2021 at 04:00:08PM +0100, Stuart Henderson wrote:
> > > > > On 2021/09/16 14:46, Sergey A. Osokin wrote:
> > > > > > On Tue, Sep 07, 2021 at 12:56:03PM +, Sergey A. Osokin wrote:
> >
> > [...]
> >
> > > > NGINX Unit doesn't utilize perl-/python-/ruby-specific infrastructure,
> > > > it just install its own module for specific languages and their
> > > > versions.
> > >
> > > they are installed in a directory outside of /usr/local (the normal
> > > PREFIX for
> > > ports/packages).
>
> [...]
>
> > And here's the example: on both FreeBSD and NetBSD it's
> > ${PREFIX}/libexec/unit/modules directory.
>
> Updated the port followed by suggestions, could please take a look.
And one more.
--
Sergey Osokin
unit.tgz
Description: application/gtar-compressed
signature.asc
Description: PGP signature
Re: [NEW] www/unit
On Thu, Sep 16, 2021 at 05:02:15PM +, Sergey A. Osokin wrote:
> On Thu, Sep 16, 2021 at 05:47:19PM +0100, Stuart Henderson wrote:
> > On 2021/09/16 16:05, Sergey A. Osokin wrote:
> > > On Thu, Sep 16, 2021 at 04:00:08PM +0100, Stuart Henderson wrote:
> > > > On 2021/09/16 14:46, Sergey A. Osokin wrote:
> > > > > On Tue, Sep 07, 2021 at 12:56:03PM +, Sergey A. Osokin wrote:
>
> [...]
>
> > > NGINX Unit doesn't utilize perl-/python-/ruby-specific infrastructure,
> > > it just install its own module for specific languages and their versions.
> >
> > they are installed in a directory outside of /usr/local (the normal PREFIX
> > for
> > ports/packages).
[...]
> And here's the example: on both FreeBSD and NetBSD it's
> ${PREFIX}/libexec/unit/modules directory.
Updated the port followed by suggestions, could please take a look.
--
Sergey Osokin
unit.tgz
Description: application/gtar-compressed
Re: [NEW] www/unit
On Thu, Sep 16, 2021 at 05:47:19PM +0100, Stuart Henderson wrote:
> On 2021/09/16 16:05, Sergey A. Osokin wrote:
> > On Thu, Sep 16, 2021 at 04:00:08PM +0100, Stuart Henderson wrote:
> > > On 2021/09/16 14:46, Sergey A. Osokin wrote:
> > > > On Tue, Sep 07, 2021 at 12:56:03PM +, Sergey A. Osokin wrote:
[...]
> > NGINX Unit doesn't utilize perl-/python-/ruby-specific infrastructure,
> > it just install its own module for specific languages and their versions.
>
> they are installed in a directory outside of /usr/local (the normal PREFIX for
> ports/packages).
True. I've found that www/nginx installs its modules into /var/www/modules,
and that's why I did the same for NGINX Unit, last one installs its own
modules into /var/unit/modules. Please confirm it's correct.
And if it's not correct, could you guide me where should I install
NGINX Unit modules.
And here's the example: on both FreeBSD and NetBSD it's
${PREFIX}/libexec/unit/modules directory.
> that should be handled by setting PREFIX-$subpkg rather than
> with what is essentially @cwd /var/www/unit/modules
That's a bit unclear, could you provide an example how can I handle that.
Thank you.
--
Sergey A. Osokin
Re: [NEW] www/unit
On Thu, Sep 16, 2021 at 04:00:08PM +0100, Stuart Henderson wrote:
> On 2021/09/16 14:46, Sergey A. Osokin wrote:
> > On Tue, Sep 07, 2021 at 12:56:03PM +0000, Sergey A. Osokin wrote:
> > > Hi there,
> > >
> > > I'm glad to share with you NGINX Unit port for OpenBSD has been created.
> > >
> > > In addition to the port (it's been attached to this email as a tarball)
> > > an additional user account `unit' and `unit' group are need to be created.
> > >
> > > Please let me know your thoughts, ask questions, provide comments.
>
> >From a read through (I have not tried building yet):
>
> - usernames for ports daemons should be prefixed by _ and must be
> created in the PLIST (@newuser / @newgroup annotations)
done.
> - the subpackages should just set PREFIX-python etc, don't use @cwd in
> their PLISTs
NGINX Unit doesn't utilize perl-/python-/ruby-specific infrastructure,
it just install its own module for specific languages and their versions.
> - lowercase at the start of COMMENT, unless it's a proper noun, i.e.
> s/Dynamic/dynamic/ in COMMENT-main
done.
> - "include bsd.port.arch.mk" should be later. specifically it needs to go
> after the FLAVOR ?=, but as it has hard to predict side-effects it's
> better to have as few parts after it as possible, I would move to just
> before the ".if ${BUILD_PACKAGES..." lines as those are the only parts
> which require it.
done.
> - drop "DISTFILES=${DISTNAME}${EXTRACT_SUFX}", that is the default
done.
> - separate line for each *_DEPENDS entry i.e. change
> RUN_DEPENDS-python= www/unit,-main ${MODPY_LIB_DEPENDS}
> to
> RUN_DEPENDS-python= www/unit,-main \
> ${MODPY_LIB_DEPENDS}
done.
> - there are specific variables for the binaries for python/ruby:
> ${MODPY_BIN} and ${RUBY}, unless the configure script really doesn't
> want a path please use them rather than building up your own in
> CONFIGURE_ENV ${RUBY}
done.
I've also fixed some issues related to building and packaging.
The updated version is attached, please take a look.
Thank you.
--
Sergey A. Osokin
unit.tgz
Description: application/gtar-compressed
Re: [NEW] www/unit
Hi, kindly reminder. Please let me know if you have any questions. Thank you. On Tue, Sep 07, 2021 at 12:56:03PM +, Sergey A. Osokin wrote: > Hi there, > > I'm glad to share with you NGINX Unit port for OpenBSD has been created. > > In addition to the port (it's been attached to this email as a tarball) > an additional user account `unit' and `unit' group are need to be created. > > Please let me know your thoughts, ask questions, provide comments. -- Sergey Osokin signature.asc Description: PGP signature
Re: [NEW] www/unit
Hi Stuart, thanks for the update. On Wed, Sep 08, 2021 at 02:49:10PM +0100, Stuart Henderson wrote: > It is only about 24h since you posted your first message. Have patience. Please let me know if you have any questions. -- Sergey Osokin
Re: [NEW] www/unit
Hi, could you please provide an update. Thank you. -- Sergey Osokin On Tue, Sep 07, 2021 at 12:56:03PM +, Sergey A. Osokin wrote: > Hi there, > > I'm glad to share with you NGINX Unit port for OpenBSD has been created. > > In addition to the port (it's been attached to this email as a tarball) > an additional user account `unit' and `unit' group are need to be created. > > Please let me know your thoughts, ask questions, provide comments.
[NEW] www/unit
Hi there, I'm glad to share with you NGINX Unit port for OpenBSD has been created. In addition to the port (it's been attached to this email as a tarball) an additional user account `unit' and `unit' group are need to be created. Please let me know your thoughts, ask questions, provide comments. Thank you. -- Sergey Osokin unit.tgz Description: application/gtar-compressed
Re: www/unit
Hi,
here's the latest revision of www/unit/Makefile, it's
buildable, creates four packages:
1) unit
2) unit-perl
3) unit-python
4) unit-ruby
The unit-php module is postpone, it needs to have php
shared library enabled in the parent packages.
Could you help me with review.
Thank you.
--
Sergey Osokin
# $OpenBSD$
COMMENT-main= Dynamic web application server
COMMENT-perl= NGINX Unit perl module
COMMENT-python= NGINX Unit python module
COMMENT-ruby= NGINX Unit ruby module
VERSION=1.25.0
DISTNAME= unit-${VERSION}
PKGNAME-main= ${DISTNAME}
PKGNAME-perl= unit-perl-${VERSION}
PKGNAME-python= unit-python-${VERSION}
PKGNAME-ruby= unit-ruby-${VERSION}
CATEGORIES= www
HOMEPAGE= https://unit.nginx.org
MAINTAINER= Sergey A. Osokin
PERMIT_PACKAGE= Yes
MULTI_PACKAGES= -main ${MODULE_PACKAGES}
MODULE_PACKAGES=-perl -python -ruby
.include
FLAVOR ?=
WANTLIB-main= c crypto pcre2-8 ssl z
WANTLIB-perl= c m perl
WANTLIB-python= ${MODPY_WANTLIB}
WANTLIB-ruby= ${MODRUBY_WANTLIB}
MASTER_SITES= https://unit.nginx.org/download/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
COMPILER= base-clang ports-gcc
COMPILER_LANGS= c
LIB_DEPENDS-main= devel/pcre2
RUN_DEPENDS-perl= www/unit,-main
LIB_DEPENDS-python= ${MODPY_LIB_DEPENDS}
RUN_DEPENDS-python= www/unit,-main ${MODPY_LIB_DEPENDS}
LIB_DEPENDS-ruby= ${MODRUBY_LIB_DEPENDS}
RUN_DEPENDS-ruby = www/unit,-main ${MODRUBY_LIB_DEPENDS}
CONFIGURE_STYLE=simple
UNIT_DIR= /var/unit
SUBST_VARS= UNIT_DIR
CFLAGS+=-I ${LOCALBASE}/include
LDFLAGS+= -L ${LOCALBASE}/lib
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --prefix=${UNIT_DIR} \
--bindir=${PREFIX}/bin \
--sbindir=${PREFIX}/sbin \
--libdir=${PREFIX}/lib \
--incdir=${PREFIX}/include \
--mandir=${PREFIX}/man \
--modules=${UNIT_DIR}/modules \
--log=logs/unit.log \
--pid=/var/run/unit.pid \
--openssl \
--user=unit \
--group=unit
.if ${BUILD_PACKAGES:M-python}
MODULES+= lang/python
CONFIGURE_ENV+= PYTHON=python${MODPY_VERSION} \
PYTHON_CONFIG=python${MODPY_VERSION}-config
.endif
.if ${BUILD_PACKAGES:M-ruby}
MODULES+= lang/ruby
CONFIGURE_ENV+= RUBY=ruby${MODRUBY_REV}
.endif
NO_TEST=Yes
post-configure:
.if ${BUILD_PACKAGES:M-perl}
cd ${WRKSRC} && ./configure perl
.endif
.if ${BUILD_PACKAGES:M-python}
cd ${WRKSRC} && ./configure python \
--config=python${MODPY_VERSION}-config
.endif
.if ${BUILD_PACKAGES:M-ruby}
cd ${WRKSRC} && ./configure ruby --ruby=${MODRUBY_FLAVOR} \
--module=ruby${MODRUBY_REV}
.endif
post-install:
${INSTALL_DATA_DIR} ${WRKINST}${UNIT_DIR}
${INSTALL_DATA_DIR} ${WRKINST}${UNIT_DIR}/modules
${INSTALL_DATA_DIR} ${WRKINST}${UNIT_DIR}/state
.include
www/unit
Hi,
hope you're doing well these days.
I'm working on creation a port for the NGINX Unit,
https://unit.nginx.org.
I've created Makefile for unitd, main binary, the daemon.
It's attached.
Next step is to create additional packages of Unit's modules: perl,
php, python, and ruby. So, I need your help on that.
On FreeBSD and NetBSD we have separate ports/packages for the languages.
To configure a module for Unit the configure script needs to be run
twice:
1. to configure unit daemon
2. to configure a unit module
Could you guide me about best practices in this case.
Should I create a separate port for every language?
Or it's possible to define all packages in one big Makefile?
Thank you.
--
Sergey Osokin
# $OpenBSD$
COMMENT=Dynamic web application server
VERSION=1.25.0
DISTNAME= unit-${VERSION}
PKGNAME=${DISTNAME}
CATEGORIES= www
HOMEPAGE= https://unit.nginx.org
MAINTAINER= Sergey A. Osokin
PERMIT_PACKAGE= Yes
WANTLIB=c crypto pcre2-8 ssl z
MASTER_SITES= https://unit.nginx.org/download/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
COMPILER= base-clang ports-gcc
COMPILER_LANGS= c
LIB_DEPENDS=devel/pcre2
CONFIGURE_STYLE = simple
UNIT_DIR= /var/unit
SUBST_VARS= UNIT_DIR
CFLAGS+=-I ${LOCALBASE}/include
LDFLAGS+= -L ${LOCALBASE}/lib
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS =--prefix=${UNIT_DIR} \
--bindir=${PREFIX}/bin \
--sbindir=${PREFIX}/sbin \
--libdir=${PREFIX}/lib \
--incdir=${PREFIX}/include \
--mandir=${PREFIX}/man \
--modules=${UNIT_DIR}/modules \
--log=logs/unit.log \
--pid=/var/run/unit.pid \
--openssl \
--user=unit \
--group=unit
NO_TEST=Yes
post-install:
${INSTALL_DATA_DIR} ${WRKINST}${UNIT_DIR}
${INSTALL_DATA_DIR} ${WRKINST}${UNIT_DIR}/modules
${INSTALL_DATA_DIR} ${WRKINST}${UNIT_DIR}/state
.include
