From nobody Sat Nov 18 20:22:35 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 4SXlZ36d8mz51Z4G; Sat, 18 Nov 2023 20:22:35 +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 4SXlZ36B0Wz4Smb; Sat, 18 Nov 2023 20:22:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700338955; 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=kD1yEyItA1xDacs49mp1I3E3k8udarRHZp3rSrdhrkM=; b=aP0XZLGxHf60KxQ+/EDn6lO/IOrnRa6ZpEsZhMyRb+G5RuZ3iikxWQZxwsp+RqDu8imbPT FQh3mK5Se31aDoG0agkoY9Ie6EFV4TmXAiwVL4ixAydExsjWjkU3YTi/6Qw49A8AHQLqhV FXFj5d5pHz1THOBauxn2TfI8i5EsWJ5+doHjuTTUn0Gly0B33StJSn5m7UqG4neQHPtsEf NkT52gthbcokS/tJnY6H4yJSxe21B0YpTTgro5BhA519xHRcOHPsbAZHDZ3z7fsLWyDiCZ cpSzH1lGNuF9A4OHkiygQSe5EbxQq/63Yf8/tJ184v/wntRPlwgCd6Bt3fIArg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700338955; 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=kD1yEyItA1xDacs49mp1I3E3k8udarRHZp3rSrdhrkM=; b=nLxJCLoH/KNEcCvPiBoNvyrt1FMzFZtmke2aQPAjGI+jqjXAcN1tYk8rPWXAx6D1gDrdGg J3YqEjUQ/MotZbGNvcRup8CDz4dxFEUH3E86rA3yGyflGRlAC3Hgak4NwYOjMDuDFbXZyf Hw/yFIKrU/wHCpeB84AR8DMHAva7gLzD4ncke2/7+4sYuYmR801KHBsjOWU7ymoXC6U1wN 7HxXOcCHkrTcOFxRXza6wZIkLvtQyRf2YXwUbipD3RLgyhfFGKMNl6CmRBha9Ynr06eQre WMMx3lIf1vnuarUSBhTN1nX/MDStT7MmxVuU9tmCeTl0Z4TmMQN8zANVji1ovg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700338955; a=rsa-sha256; cv=none; b=xoctQMkYk7jM0s+pRLqXjAmHoVWubcfGUTjf29zeE2DKlCMcmHo/fICMKj+0tk3b6mgHv4 Xz+BC50q0EanEQ9q+lyKvvanEYrTzAbvvS+4r71BKV9CnbkDv/CU+RB+Gy4v+rainUM/C6 qY4Tetv3/yIDWvR8M7g6eqakrFPyfPQJZdNq5YOqCTwPBiY+K6OHoHcKfmNRNAcbYHX1Jo ZPaGha5eWvKD3HJ4T55JG1Li9p/bGzghVPhAfXudsbpWbDaIomAtnoWyRZUe/ZU8V1d1MT EZ0EeiYtvNPyW7KaLFODoErpxwj8n33xztSRn6Wkh95n6bTajtEjqcRWTMnqWg== 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 4SXlZ35J9lzgwG; Sat, 18 Nov 2023 20:22:35 +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 3AIKMZNR015146; Sat, 18 Nov 2023 20:22:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AIKMZeY015143; Sat, 18 Nov 2023 20:22:35 GMT (envelope-from git) Date: Sat, 18 Nov 2023 20:22:35 GMT Message-Id: <202311182022.3AIKMZeY015143@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: dc6553d233dc - main - www/angie: Update to 1.3.1 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: dc6553d233dc97aa8f39afc72e1096387ef27c12 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=dc6553d233dc97aa8f39afc72e1096387ef27c12 commit dc6553d233dc97aa8f39afc72e1096387ef27c12 Author: Oleg A. Mamontov AuthorDate: 2023-11-13 21:16:51 +0000 Commit: Robert Clausecker CommitDate: 2023-11-18 20:20:40 +0000 www/angie: Update to 1.3.1 - remove @sample marker from html; these files are not supposed to be modified by the end user - obey CFLAGS/LDFLAGS and add USES=localbase. This allows dependent modules to add necessary compiler/linker hints. Changelog: https://github.com/webserver-llc/angie/blob/master/CHANGES PR: 274728 --- www/angie/Makefile | 10 +++++----- www/angie/distinfo | 6 +++--- www/angie/pkg-plist | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/www/angie/Makefile b/www/angie/Makefile index c6f778d99dbf..f7c831f9fcb5 100644 --- a/www/angie/Makefile +++ b/www/angie/Makefile @@ -1,5 +1,5 @@ PORTNAME?= angie -PORTVERSION= 1.3.0 +PORTVERSION= 1.3.1 CATEGORIES+= www MASTER_SITES+= https://download.angie.software/files/:angie DISTNAME= angie-${DISTVERSIONFULL} @@ -23,7 +23,7 @@ BUILD_DEPENDS+= pcre2>=0:devel/pcre2 RUN_DEPENDS+= angie==${PKGVERSION}:www/angie .endif -USES+= ssl +USES+= localbase:ldflags ssl USE_GITHUB= nodefault HAS_CONFIGURE?= yes @@ -107,8 +107,8 @@ CONFIGURE_ARGS= --prefix=${PREFIX}/etc/angie \ --with-stream_ssl_module \ --with-stream_ssl_preread_module \ --with-threads \ - --with-cc-opt="-I ${LOCALBASE}/include" \ - --with-ld-opt="-L ${LOCALBASE}/lib" \ + --with-cc-opt="${CFLAGS}" \ + --with-ld-opt="${LDFLAGS}" \ ${CONFIGURE_ADD} OPTIONS_DEFINE?= DEBUG @@ -176,7 +176,7 @@ do-install: ${INSTALL_DATA} ${WRKDIR}/example.conf.sample \ ${STAGEDIR}${ETCDIR}/stream.d .for i in 50x.html index.html - ${INSTALL_DATA} ${WRKSRC}/html/${i} ${STAGEDIR}${WWWDIR}/html/${i}.sample + ${INSTALL_DATA} ${WRKSRC}/html/${i} ${STAGEDIR}${WWWDIR}/html/${i} .endfor do-install-DEBUG-on: diff --git a/www/angie/distinfo b/www/angie/distinfo index 80d8dec1f279..f005d5f94512 100644 --- a/www/angie/distinfo +++ b/www/angie/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1695813432 -SHA256 (angie-1.3.0.tar.gz) = bc39d307f1644964f394c65ca4f416b81e03cbcfa0b4106931f84def39a87474 -SIZE (angie-1.3.0.tar.gz) = 1482717 +TIMESTAMP = 1699910196 +SHA256 (angie-1.3.1.tar.gz) = 1a7fd6f8d8db7cdc71f1cdbe44b2ca57a0b55d6cae2569639bd223d4663ecd23 +SIZE (angie-1.3.1.tar.gz) = 1482949 SHA256 (kjdev-nginx-auth-jwt-0.2.1_GH0.tar.gz) = 23958d5f02012f56660cacc3c0355bafea10ceb77abb3f0e8da123edf1f7d8f1 SIZE (kjdev-nginx-auth-jwt-0.2.1_GH0.tar.gz) = 58717 SHA256 (stnoonan-spnego-http-auth-nginx-module-v1.1.1_GH0.tar.gz) = ed267444667d3f85f92d1bd910a7010e8272f4de1aa83afa39c1c97eac17dade diff --git a/www/angie/pkg-plist b/www/angie/pkg-plist index edc84e7ee030..2c77c1a62d2e 100644 --- a/www/angie/pkg-plist +++ b/www/angie/pkg-plist @@ -25,5 +25,5 @@ man/man8/angie.8.gz @sample %%ETCDIR%%/http.d/default.conf.sample @sample %%ETCDIR%%/stream.d/example.conf.sample -@sample %%WWWDIR%%/html/50x.html.sample -@sample %%WWWDIR%%/html/index.html.sample +%%WWWDIR%%/html/50x.html +%%WWWDIR%%/html/index.html