From nobody Tue Jul 12 16:51:02 2022 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 E781117FA472; Tue, 12 Jul 2022 16:51:02 +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 4Lj6Fy3XMRz3VV2; Tue, 12 Jul 2022 16:51:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657644662; 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=nkItEX/bSESXI3qQnfzUFmN26rs2edEeuD0sjnq/EGQ=; b=MHqcK+TCjQhpOAPBP/6Hw+lM8q6BwwpLP4bpi91VWQYkFWsdagqshuQ+lix6hwe3vqL2Rw R7PP6Ezp1JLMd7joFRkf6Ci7iF3yXN81FbxZqw+EXocanv+CIkQegoW9IPdmt8zHfSRLBv MzD6Mw2grTM8XT5B6wKJdM+F9bRwqL+pJZ2xMK+IgR6iuR8wlYw1sk0CWG6oyVi+TH7TD9 CVCqkePfsYVHLS33qX4JBGNtJv9VBZ5DVlBLdIC1N1ppyJ70DEEVodYTCEDUczi2oPs1d2 tJUr4tHaW4XTnYbiwGR0H09ajVrRkDtr6kmuBrojzRq3cN2wV39d7F2z1XZzfA== 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 4Lj6Fy2ccvzrZQ; Tue, 12 Jul 2022 16:51:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26CGp2Ox007379; Tue, 12 Jul 2022 16:51:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26CGp21O007371; Tue, 12 Jul 2022 16:51:02 GMT (envelope-from git) Date: Tue, 12 Jul 2022 16:51:02 GMT Message-Id: <202207121651.26CGp21O007371@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jochen Neumeister Subject: git: 8a8b3beec3b3 - main - www/nginx: revert to 1.22.0 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: joneum X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a8b3beec3b3e57ca78671eb50c7f794b8421bb4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657644662; 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=nkItEX/bSESXI3qQnfzUFmN26rs2edEeuD0sjnq/EGQ=; b=rL8U1ncgISISWZG8u0GaXn1SAk3osMiIToB8C/zWsr6YdCDNGwamSxJixgxmUNw4K3qz5z YnZXJEBs68/E9zc14D11q8231amlf9n0XNZb2VmgspubauunZkTVjPlOVDK8WEWE5yTfKH JDVjOXprD6psnuF15ipwZgxMwPuSQAKygMMDRmI3fpLlwmk4Tuh4XZLHs2/okM68HKXX2+ jrZqHXKFF+F4lJcUD0rvboAX+SCuX4KKIqYAkQdDJTZsj8yrn8mCsBPVrpWWlvo4NItSdi gc9pbj2Z3VW+qUUKUdnco/g8K/oGadCF1FYvTukVaQQEOJWkES7ZopUQL96ZCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657644662; a=rsa-sha256; cv=none; b=FACWckUFkmAVyN5mCgxSpJRfTAGYiBCU5/4VxB0uZGmqkeuzdBYnah6Yjo/EtiYlbSrJ/0 jHh/IahqvyLa5OCvRRjVVeHHinTAOGTfwZKIbAq2HVg3tggJDwfkChPJS0sIvN7goyud05 UwsEW7KZhAob7sfrzOm79QOXTnqOyUhlyS0LNeRQvtCg28JkKhglVr46KH2Rj2gdEJoPQ5 Wuq+zRXKFSjHYuibqkOCmA36zP4WLRKoT0zFyhobZbydG854lKtEg4T2cnebOslJGZcNka 5HN162zNQrdsz5DPInXfXqACpbnakeB1+5ALUuY6NJb8T5CML7zgsglo5iQQFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by joneum: URL: https://cgit.FreeBSD.org/ports/commit/?id=8a8b3beec3b3e57ca78671eb50c7f794b8421bb4 commit 8a8b3beec3b3e57ca78671eb50c7f794b8421bb4 Author: Jochen Neumeister AuthorDate: 2022-07-12 16:48:43 +0000 Commit: Jochen Neumeister CommitDate: 2022-07-12 16:50:57 +0000 www/nginx: revert to 1.22.0 reverted to 1.22.0 by my mistake, since 1.23.x is a mainline version More Coffee for: joneum Sponsored by: Netzkommune GmbH --- www/nginx/Makefile | 8 ++++---- www/nginx/Makefile.extmod | 3 +-- www/nginx/distinfo | 10 +++++----- www/nginx/files/extra-patch-ngx_http_clojure_mem.h | 11 ----------- 4 files changed, 10 insertions(+), 22 deletions(-) diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 5c396f9fc5ca..f05f844f2946 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -1,9 +1,9 @@ # Created by: Sergey A. Osokin PORTNAME= nginx -PORTVERSION= 1.23.0 -PORTREVISION?= 0 -PORTEPOCH= 2 +PORTVERSION= 1.22.0 +PORTREVISION?= 6 +PORTEPOCH= 3 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ http://nginx.org/download/ \ @@ -21,7 +21,7 @@ BROKEN_mips64= error ngx_spinlock() or ngx_atomic_cmp_set() are not defined CONFLICTS_INSTALL= nginx-devel -PORTSCOUT= limit:^1\.23\.[0-9]* +PORTSCOUT= limit:^1\.22\.[0-9]* USES= compiler:c11 cpe diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod index f68cb18edc23..e03071ed5fc0 100644 --- a/www/nginx/Makefile.extmod +++ b/www/nginx/Makefile.extmod @@ -19,10 +19,9 @@ CACHE_PURGE_CONFIGURE_ON= --add-module=${WRKDIR}/ngx_cache_purge-4746629 CLOJURE_CATEGORIES+= java CLOJURE_USE= JAVA=yes JAVA_OS=native JAVA_VERSION=1.8 \ JAVA_VENDOR=openjdk JAVA_BUILD=yes JAVA_RUN=yes -CLOJURE_GH_TUPLE= nginx-clojure:nginx-clojure:4347955:clojure +CLOJURE_GH_TUPLE= nginx-clojure:nginx-clojure:v0.5.2:clojure CLOJURE_CONFIGURE_ENV= "JNI_INCS=-I${LOCALBASE}/openjdk8/include -I${LOCALBASE}/openjdk8/include/freebsd" CLOJURE_VARS= DSO_EXTMODS+=clojure CLOJURE_SUBDIR=/src/c -CLOJURE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_clojure_mem.h CT_IMPLIES= HTTP_SSL CT_GH_TUPLE= grahamedgecombe:nginx-ct:v1.3.2:ct diff --git a/www/nginx/distinfo b/www/nginx/distinfo index 08422342f4c9..7fbd98677b54 100644 --- a/www/nginx/distinfo +++ b/www/nginx/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1657613920 -SHA256 (nginx-1.23.0.tar.gz) = 820acaa35b9272be9e9e72f6defa4a5f2921824709f8aa4772c78ab31ed94cd1 -SIZE (nginx-1.23.0.tar.gz) = 1102940 +TIMESTAMP = 1657641709 +SHA256 (nginx-1.22.0.tar.gz) = b33d569a6f11a01433a57ce17e83935e953ad4dc77cdd4d40f896c88ac26eb53 +SIZE (nginx-1.22.0.tar.gz) = 1073322 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae SIZE (nginx_mogilefs_module-1.0.4.tar.gz) = 11208 SHA256 (nginx_mod_h264_streaming-2.2.7.tar.gz) = 6d974ba630cef59de1f60996c66b401264a345d25988a76037c2856cec756c19 @@ -21,8 +21,8 @@ SHA256 (google-ngx_brotli-9aec15e_GH0.tar.gz) = 0177b1158ff7092b9996346de28a0b29 SIZE (google-ngx_brotli-9aec15e_GH0.tar.gz) = 16194 SHA256 (nginx-modules-ngx_cache_purge-4746629_GH0.tar.gz) = 68debae40722e15a70f37e10d20a4d3b9a26597457f1dd639e903b62c0a2f689 SIZE (nginx-modules-ngx_cache_purge-4746629_GH0.tar.gz) = 17114 -SHA256 (nginx-clojure-nginx-clojure-4347955_GH0.tar.gz) = 9f0fc3b479936fc5b20101c6d238bff5a6f4a32b28d8ec4a511f902abe2abc1f -SIZE (nginx-clojure-nginx-clojure-4347955_GH0.tar.gz) = 756519 +SHA256 (nginx-clojure-nginx-clojure-v0.5.2_GH0.tar.gz) = cb8bc0bef5d298df55fb625400cb77c4145dc5167483e111ff2b90d4d3396200 +SIZE (nginx-clojure-nginx-clojure-v0.5.2_GH0.tar.gz) = 755650 SHA256 (grahamedgecombe-nginx-ct-v1.3.2_GH0.tar.gz) = b4ceae549b9dbf84b2e511633982e4efeee0388e3b7a038a8bac555008a77b88 SIZE (grahamedgecombe-nginx-ct-v1.3.2_GH0.tar.gz) = 6844 SHA256 (simpl-ngx_devel_kit-v0.3.1_GH0.tar.gz) = 0e971105e210d272a497567fa2e2c256f4e39b845a5ba80d373e26ba1abfbd85 diff --git a/www/nginx/files/extra-patch-ngx_http_clojure_mem.h b/www/nginx/files/extra-patch-ngx_http_clojure_mem.h deleted file mode 100644 index 8ccf7ea4ba2b..000000000000 --- a/www/nginx/files/extra-patch-ngx_http_clojure_mem.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ../nginx-clojure-4347955/src/c/ngx_http_clojure_mem.h.orig 2022-07-11 13:38:32.426478000 -0400 -+++ ../nginx-clojure-4347955/src/c/ngx_http_clojure_mem.h 2022-07-11 13:38:45.346434000 -0400 -@@ -421,7 +421,7 @@ - #define NGX_HTTP_CLOJURE_HEADERSI_PASSWD_IDX 90 - #define NGX_HTTP_CLOJURE_HEADERSI_PASSWD_OFFSET offsetof(ngx_http_headers_in_t, passwd) - #define NGX_HTTP_CLOJURE_HEADERSI_COOKIE_IDX 91 --#define NGX_HTTP_CLOJURE_HEADERSI_COOKIE_OFFSET offsetof(ngx_http_headers_in_t, cookies) -+#define NGX_HTTP_CLOJURE_HEADERSI_COOKIE_OFFSET offsetof(ngx_http_headers_in_t, cookie) - #define NGX_HTTP_CLOJURE_HEADERSI_SERVER_IDX 92 - #define NGX_HTTP_CLOJURE_HEADERSI_SERVER_OFFSET offsetof(ngx_http_headers_in_t, server) - #define NGX_HTTP_CLOJURE_HEADERSI_CONTENT_LENGTH_N_IDX 93