pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/www/nginx
Module Name: pkgsrc
Committed By: wiz
Date: Wed Nov 13 10:56:37 UTC 2024
Modified Files:
pkgsrc/www/nginx: Makefile distinfo options.mk
pkgsrc/www/nginx/patches: patch-conf_nginx.conf
Log Message:
nginx: run pkglint -F
To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 pkgsrc/www/nginx/Makefile
cvs rdiff -u -r1.123 -r1.124 pkgsrc/www/nginx/distinfo
cvs rdiff -u -r1.105 -r1.106 pkgsrc/www/nginx/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/nginx/patches/patch-conf_nginx.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/www/nginx/Makefile
diff -u pkgsrc/www/nginx/Makefile:1.161 pkgsrc/www/nginx/Makefile:1.162
--- pkgsrc/www/nginx/Makefile:1.161 Fri Nov 1 12:54:54 2024
+++ pkgsrc/www/nginx/Makefile Wed Nov 13 10:56:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.161 2024/11/01 12:54:54 wiz Exp $
+# $NetBSD: Makefile,v 1.162 2024/11/13 10:56:36 wiz Exp $
DISTNAME= nginx-1.26.2
PKGREVISION= 3
@@ -54,11 +54,11 @@ CONFIGURE_ARGS+= --http-fastcgi-temp-pat
CONFIGURE_ARGS+= --http-scgi-temp-path=${NGINX_DATADIR}/scgi_temp
CONFIGURE_ARGS+= --with-pcre
-SUBST_CLASSES+= fix-pcre2
-SUBST_STAGE.fix-pcre2= pre-configure
-SUBST_FILES.fix-pcre2= auto/lib/pcre/conf
-SUBST_SED.fix-pcre2= -e 's,/usr/pkg,${BUILDLINK_PREFIX.pcre2},g'
-SUBST_NOOP_OK.fix-pcre2=yes
+SUBST_CLASSES+= fix-pcre2
+SUBST_STAGE.fix-pcre2= pre-configure
+SUBST_FILES.fix-pcre2= auto/lib/pcre/conf
+SUBST_SED.fix-pcre2= -e 's,/usr/pkg,${BUILDLINK_PREFIX.pcre2},g'
+SUBST_NOOP_OK.fix-pcre2= yes
PKG_SYSCONFSUBDIR= nginx
Index: pkgsrc/www/nginx/distinfo
diff -u pkgsrc/www/nginx/distinfo:1.123 pkgsrc/www/nginx/distinfo:1.124
--- pkgsrc/www/nginx/distinfo:1.123 Wed Nov 13 10:50:20 2024
+++ pkgsrc/www/nginx/distinfo Wed Nov 13 10:56:36 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.123 2024/11/13 10:50:20 jperkin Exp $
+$NetBSD: distinfo,v 1.124 2024/11/13 10:56:36 wiz Exp $
BLAKE2s (1ac658f44afc9240f13e9d6c1c9d5a7816299e8e.patch) = 6c3880dc781886fb1f4190fa9b8f1459246cc5d157aaed3b9a24cc7abaf7c5a1
SHA512 (1ac658f44afc9240f13e9d6c1c9d5a7816299e8e.patch) = b780bea19736f5db844f11b0b407c159cc6ba7326b50177cefde6f8ee875238d3618e50d29b132a66fe98103cb5656f33895e5989d98d4cdc26cfeaa7f12865f
@@ -68,4 +68,4 @@ SHA512 (vozlt-nginx-module-vts-bf64dbf_G
Size (vozlt-nginx-module-vts-bf64dbf_GH.tar.gz) = 180394 bytes
SHA1 (patch-auto_cc_conf) = 5e6a479ba419cd16dedeb3b4c47dc685d126ef6a
SHA1 (patch-auto_install) = 3b3a0f9f4c005b707664554fa57a58c9e3b7de60
-SHA1 (patch-conf_nginx.conf) = c87c76604a5aae64f8c039f90f9291e3134f64e0
+SHA1 (patch-conf_nginx.conf) = 1235eecd13c30822c2124371f43b5d7450ac7bf5
Index: pkgsrc/www/nginx/options.mk
diff -u pkgsrc/www/nginx/options.mk:1.105 pkgsrc/www/nginx/options.mk:1.106
--- pkgsrc/www/nginx/options.mk:1.105 Wed Oct 23 13:15:19 2024
+++ pkgsrc/www/nginx/options.mk Wed Nov 13 10:56:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.105 2024/10/23 13:15:19 osa Exp $
+# $NetBSD: options.mk,v 1.106 2024/11/13 10:56:36 wiz Exp $
CODELOAD_SITE_GITHUB= https://codeload.github.com/
@@ -123,15 +123,15 @@ CONFIGURE_ARGS+= --with-http_realip_modu
.endif
.if !empty(PKG_OPTIONS:Mredis)
-REDIS_GH_ACCOUNT= osokin
-REDIS_GH_PROJECT= ngx_http_redis
-REDIS_VERSION= 59eb1c3
-REDIS_DISTNAME= ${REDIS_GH_PROJECT}-${REDIS_VERSION}
-REDIS_DISTFILE= ${REDIS_GH_ACCOUNT}-${REDIS_DISTNAME}_GH.tar.gz
-SITES.${REDIS_DISTFILE}=-${CODELOAD_SITE_GITHUB:=${REDIS_GH_ACCOUNT}/${REDIS_GH_PROJECT}/tar.gz/${REDIS_VERSION}?dummy=${REDIS_DISTFILE}}
-DISTFILES+= ${REDIS_DISTFILE}
-DSO_EXTMODS+= redis
-PLIST.redis= yes
+REDIS_GH_ACCOUNT= osokin
+REDIS_GH_PROJECT= ngx_http_redis
+REDIS_VERSION= 59eb1c3
+REDIS_DISTNAME= ${REDIS_GH_PROJECT}-${REDIS_VERSION}
+REDIS_DISTFILE= ${REDIS_GH_ACCOUNT}-${REDIS_DISTNAME}_GH.tar.gz
+SITES.${REDIS_DISTFILE}= -${CODELOAD_SITE_GITHUB:=${REDIS_GH_ACCOUNT}/${REDIS_GH_PROJECT}/tar.gz/${REDIS_VERSION}?dummy=${REDIS_DISTFILE}}
+DISTFILES+= ${REDIS_DISTFILE}
+DSO_EXTMODS+= redis
+PLIST.redis= yes
.endif
# NDK must be added once and before 3rd party modules needing it
@@ -341,25 +341,25 @@ CONFIGURE_ENV+= NJS_LIBXSLT=NO
.endif
.if !empty(PKG_OPTIONS:Mupload) || make(makesum) || make(mdi) || make(distclean)
-UPLOAD_VERSION= 2.3.0
+UPLOAD_VERSION= 2.3.0
UPLOAD_DISTNAME= nginx-upload-module-${UPLOAD_VERSION}
UPLOAD_DISTFILE= ${UPLOAD_DISTNAME}.tar.gz
SITES.${UPLOAD_DISTFILE}= -${MASTER_SITE_GITHUB:=vkholodkov/nginx-upload-module/archive/refs/tags/}${UPLOAD_VERSION}.tar.gz
-DISTFILES+= ${UPLOAD_DISTFILE}
-DSO_EXTMODS+= upload
-PLIST.upload= yes
+DISTFILES+= ${UPLOAD_DISTFILE}
+DSO_EXTMODS+= upload
+PLIST.upload= yes
.endif
.if !empty(PKG_OPTIONS:Mgssapi) || make(makesum) || make(mdi) || make(distclean)
-GSSAPI_GH_ACCOUNT= stnoonan
-GSSAPI_GH_PROJECT= spnego-http-auth-nginx-module
-GSSAPI_VERSION= 3575542
+GSSAPI_GH_ACCOUNT= stnoonan
+GSSAPI_GH_PROJECT= spnego-http-auth-nginx-module
+GSSAPI_VERSION= 3575542
GSSAPI_DISTNAME= ${GSSAPI_GH_PROJECT}-${GSSAPI_VERSION}
GSSAPI_DISTFILE= ${GSSAPI_GH_ACCOUNT}-${GSSAPI_DISTNAME}_GH.tar.gz
SITES.${GSSAPI_DISTFILE}= -${CODELOAD_SITE_GITHUB:=${GSSAPI_GH_ACCOUNT}/${GSSAPI_GH_PROJECT}/tar.gz/${GSSAPI_VERSION}?dummy=${GSSAPI_DISTFILE}}
-DISTFILES+= ${GSSAPI_DISTFILE}
-DSO_EXTMODS+= gssapi
-PLIST.gssapi= yes
+DISTFILES+= ${GSSAPI_DISTFILE}
+DSO_EXTMODS+= gssapi
+PLIST.gssapi= yes
.endif
.if !empty(PKG_OPTIONS:Msts) || make(makesum) || make(mdi) || make(distclean)
Index: pkgsrc/www/nginx/patches/patch-conf_nginx.conf
diff -u pkgsrc/www/nginx/patches/patch-conf_nginx.conf:1.1 pkgsrc/www/nginx/patches/patch-conf_nginx.conf:1.2
--- pkgsrc/www/nginx/patches/patch-conf_nginx.conf:1.1 Tue Apr 18 18:41:59 2023
+++ pkgsrc/www/nginx/patches/patch-conf_nginx.conf Wed Nov 13 10:56:36 2024
@@ -1,3 +1,6 @@
+$NetBSD: patch-conf_nginx.conf,v 1.2 2024/11/13 10:56:36 wiz Exp $
+
+
--- conf/nginx.conf.orig 2014-04-24 12:52:24.000000000 +0000
+++ conf/nginx.conf
@@ -1,28 +1,29 @@
Home |
Main Index |
Thread Index |
Old Index