From nobody Sun Sep 10 16:13:47 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RkFJr2ZX5z4s25Q; Sun, 10 Sep 2023 16:13:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RkFJr1D8tz3QHX; Sun, 10 Sep 2023 16:13:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694362428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eIF25y48QupJ/foJF9rzMLq+oH5p5VwnKvwmNoB+a6g=; b=wq2LBVz6KOp/9jqyaCeZ349toCwq3kpMiA2etkog5bIc9RypixLKI/JUH1iC9qL4xtRhDH RcsQkrgng+QBruKHYBf87Vbddw6ECY+z7MDP0qQTFsXGbB6tgvnk9x01M1slc75S6xrNqj DiIMRu9e+/eQEpoeckBNIVyhOdZV/QuD5RSCLyjT4XlZ2ZLE8Ov+r/EHJZeVkD9REarIw5 c4h90FTcGgWxlOwrGz01X/U7t9QgdMNxsXICc81n3+lEQqU/RcEWxPs/I9mfkMmj5iO7ft JH8W31Wpp8TsFG5l78Koa7AxiVuY2zazXfYlCYygKDU0TDtYsaoyKjV3cED/dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694362428; a=rsa-sha256; cv=none; b=oCHpiizMZ3M8YqUlab15t5AEX14SV/sockhO8/lRDVIezYTRQ5D7vq3Hy+bKnwl8+X5qnR 2oUaZxvVFMdxvL3Y6BWPxuL6J412muik+DHyjFzNLBwG1hrC9cNi9agkeZ0SYS9VGh2sT+ xdf/VSIigxWO8cCbHhOTpti/LdljUsCmMX1obqvyoEzSh+U0H1ak95LyP0f4Bk/GuBsBCm 4jJ4rJenAOmz5c5JYdepycAI9jtOlZP6y0KqxRbgHM1KmGSElxYPvMMz/7RDOAe0modCA9 KCPqHK+UU3eqTupfG4CRWV0SK7PBpv154ms/zmy+fOvQo0ZVTS6jvr/Z3oVU0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694362428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eIF25y48QupJ/foJF9rzMLq+oH5p5VwnKvwmNoB+a6g=; b=FzVAyn6S32lz3PQsRIw3b89plhPwIMF7Abp5K8K9wR3/kU2mnpZPeW0vLqBg0MrJeQ5Ekf hsUE5hTJFLpoEYov0K+FXcpC6X9z5bQ5A0ONCMN2gUMNPaAxIdqKjN/KYI1pwSaGAMLCQG fnhEc8WtlFS+/uTNtf6j8zI9U676nZ8AEoQCQWBr2QKxPZPn3vBJdz2OQBVbXk+9rp1Mx1 IgmFIPIoUURmmoGnehX1BbishawXEOvBJ2XWp9Fpb0DHYUFT0AaUzdhJRoQX48qd/bpx4D W0jIw0jadMw32Mh2/2+M6PTMSkdPEun+wMEFARUA4BWu/d5d31jl4nNTyaX4gA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RkFJr0HQxz1CSs; Sun, 10 Sep 2023 16:13:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38AGDlj7025168; Sun, 10 Sep 2023 16:13:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38AGDluh025165; Sun, 10 Sep 2023 16:13:47 GMT (envelope-from git) Date: Sun, 10 Sep 2023 16:13:47 GMT Message-Id: <202309101613.38AGDluh025165@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 2043de1ccc78 - main - www/angie-module-postgres: Angie postgres dynamic module List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2043de1ccc788dae5a870aac0d57fce1c7521f06 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=2043de1ccc788dae5a870aac0d57fce1c7521f06 commit 2043de1ccc788dae5a870aac0d57fce1c7521f06 Author: Oleg A. Mamontov AuthorDate: 2023-08-30 21:00:56 +0000 Commit: Robert Clausecker CommitDate: 2023-09-10 16:13:01 +0000 www/angie-module-postgres: Angie postgres dynamic module This is an upstream module that allows Angie to communicate directly with PostgreSQL database. PR: Angie postgres dynamic module --- www/Makefile | 1 + www/angie-module-postgres/Makefile | 24 ++++++++++++++++++++ .../files/patch-ngx_postgres-default_port | 17 ++++++++++++++ .../files/patch-ngx_postgres-dynamic | 26 ++++++++++++++++++++++ .../files/patch-ngx_postgres-subrequest_in_memory | 18 +++++++++++++++ www/angie-module-postgres/files/pkg-message.in | 15 +++++++++++++ www/angie-module-postgres/pkg-descr | 2 ++ www/angie-module-postgres/pkg-plist | 3 +++ 8 files changed, 106 insertions(+) diff --git a/www/Makefile b/www/Makefile index ab07dfcccc79..1dab0aa27334 100644 --- a/www/Makefile +++ b/www/Makefile @@ -42,6 +42,7 @@ SUBDIR += angie-module-ndk SUBDIR += angie-module-njs SUBDIR += angie-module-perl + SUBDIR += angie-module-postgres SUBDIR += angie-module-redis2 SUBDIR += angie-module-xslt SUBDIR += anyremote2html diff --git a/www/angie-module-postgres/Makefile b/www/angie-module-postgres/Makefile new file mode 100644 index 000000000000..b672ce013b86 --- /dev/null +++ b/www/angie-module-postgres/Makefile @@ -0,0 +1,24 @@ +PORTNAME= angie-module-postgres +GH_TUPLE= FRiCKLE:ngx_postgres:1.0rc7:module + +COMMENT= Angie postgres dynamic module + +USES= pgsql + +MASTERDIR= ${.CURDIR}/../../www/angie + +do-install: + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${MODDIR} + + ${INSTALL_LIB} ${WRKSRC}/objs/ngx_postgres_module.so \ + ${STAGEDIR}${MODDIR} + + ${INSTALL_MAN} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR} + +do-install-DEBUG-on: + ${INSTALL} ${COPY} -m ${_SHAREMODE} \ + ${WRKSRC_DEBUG}/objs/ngx_postgres_module.so \ + ${STAGEDIR}${MODDIR}/ngx_postgres_module-debug.so + +.include "${MASTERDIR}/Makefile" diff --git a/www/angie-module-postgres/files/patch-ngx_postgres-default_port b/www/angie-module-postgres/files/patch-ngx_postgres-default_port new file mode 100644 index 000000000000..3dbdf4e7c71c --- /dev/null +++ b/www/angie-module-postgres/files/patch-ngx_postgres-default_port @@ -0,0 +1,17 @@ +--- ../ngx_postgres-1.0rc7/src/ngx_postgres_module.c.orig ++++ ../ngx_postgres-1.0rc7/src/ngx_postgres_module.c +@@ -1320,12 +1320,14 @@ + continue; + } + ++#if (nginx_version < 1011006) + if (uscfp[i]->default_port && url->default_port + && (uscfp[i]->default_port != url->default_port)) + { + dd("default_port doesn't match"); + continue; + } ++#endif + + dd("returning"); + return uscfp[i]; diff --git a/www/angie-module-postgres/files/patch-ngx_postgres-dynamic b/www/angie-module-postgres/files/patch-ngx_postgres-dynamic new file mode 100644 index 000000000000..596d3eb3bba9 --- /dev/null +++ b/www/angie-module-postgres/files/patch-ngx_postgres-dynamic @@ -0,0 +1,26 @@ +--- ../ngx_postgres-1.0rc7/config.orig ++++ ../ngx_postgres-1.0rc7/config +@@ -205,6 +205,16 @@ + + ngx_addon_name=ngx_postgres + ++if [ -f auto/module ] ; then ++ ngx_module_type=HTTP ++ ngx_module_name=ngx_postgres_module ++ ngx_module_incs=$ngx_feature_path ++ ngx_module_libs=$ngx_feature_libs ++ ngx_module_srcs="$NGX_ADDON_SRCS $ngx_addon_dir/src/ngx_postgres_escape.c $ngx_addon_dir/src/ngx_postgres_handler.c $ngx_addon_dir/src/ngx_postgres_keepalive.c $ngx_addon_dir/src/ngx_postgres_module.c $ngx_addon_dir/src/ngx_postgres_output.c $ngx_addon_dir/src/ngx_postgres_processor.c $ngx_addon_dir/src/ngx_postgres_rewrite.c $ngx_addon_dir/src/ngx_postgres_upstream.c $ngx_addon_dir/src/ngx_postgres_util.c $ngx_addon_dir/src/ngx_postgres_variable.c" ++ . auto/module ++ ++else ++ + HTTP_MODULES="$HTTP_MODULES ngx_postgres_module" + + CORE_INCS="$CORE_INCS $ngx_feature_path" +@@ -213,4 +223,6 @@ + NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/src/ngx_postgres_escape.c $ngx_addon_dir/src/ngx_postgres_handler.c $ngx_addon_dir/src/ngx_postgres_keepalive.c $ngx_addon_dir/src/ngx_postgres_module.c $ngx_addon_dir/src/ngx_postgres_output.c $ngx_addon_dir/src/ngx_postgres_processor.c $ngx_addon_dir/src/ngx_postgres_rewrite.c $ngx_addon_dir/src/ngx_postgres_upstream.c $ngx_addon_dir/src/ngx_postgres_util.c $ngx_addon_dir/src/ngx_postgres_variable.c" + NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_addon_dir/src/ngx_postgres_escape.h $ngx_addon_dir/src/ngx_postgres_handler.h $ngx_addon_dir/src/ngx_postgres_keepalive.h $ngx_addon_dir/src/ngx_postgres_module.h $ngx_addon_dir/src/ngx_postgres_output.h $ngx_addon_dir/src/ngx_postgres_processor.h $ngx_addon_dir/src/ngx_postgres_rewrite.h $ngx_addon_dir/src/ngx_postgres_upstream.h $ngx_addon_dir/src/ngx_postgres_util.h $ngx_addon_dir/src/ngx_postgres_variable.h $ngx_addon_dir/src/ngx_postgres_ddebug.h $ngx_addon_dir/src/resty_dbd_stream.h" + ++fi ++ + have=NGX_POSTGRES_MODULE . auto/have diff --git a/www/angie-module-postgres/files/patch-ngx_postgres-subrequest_in_memory b/www/angie-module-postgres/files/patch-ngx_postgres-subrequest_in_memory new file mode 100644 index 000000000000..045f74357b47 --- /dev/null +++ b/www/angie-module-postgres/files/patch-ngx_postgres-subrequest_in_memory @@ -0,0 +1,18 @@ +--- ../ngx_postgres-1.0rc7/src/ngx_postgres_handler.c.orig ++++ ../ngx_postgres-1.0rc7/src/ngx_postgres_handler.c +@@ -52,6 +52,7 @@ + + dd("entering"); + ++#if defined(nginx_version) && (nginx_version < 13010) + if (r->subrequest_in_memory) { + /* TODO: add support for subrequest in memory by + * emitting output into u->buffer instead */ +@@ -63,6 +64,7 @@ + dd("returning NGX_HTTP_INTERNAL_SERVER_ERROR"); + return NGX_HTTP_INTERNAL_SERVER_ERROR; + } ++#endif + + pglcf = ngx_http_get_module_loc_conf(r, ngx_postgres_module); + diff --git a/www/angie-module-postgres/files/pkg-message.in b/www/angie-module-postgres/files/pkg-message.in new file mode 100644 index 000000000000..b3a2a5f4c6d7 --- /dev/null +++ b/www/angie-module-postgres/files/pkg-message.in @@ -0,0 +1,15 @@ +[ +{ type: install + message: <