From owner-svn-ports-head@FreeBSD.ORG Fri Feb 20 17:22:30 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 665BE984; Fri, 20 Feb 2015 17:22:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4E31DBE6; Fri, 20 Feb 2015 17:22:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1KHMUwD079656; Fri, 20 Feb 2015 17:22:30 GMT (envelope-from robak@FreeBSD.org) Received: (from robak@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1KHMTLp079651; Fri, 20 Feb 2015 17:22:29 GMT (envelope-from robak@FreeBSD.org) Message-Id: <201502201722.t1KHMTLp079651@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: robak set sender to robak@FreeBSD.org using -f From: Bartek Rutkowski Date: Fri, 20 Feb 2015 17:22:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379453 - in head/www/tengine: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Feb 2015 17:22:30 -0000 Author: robak Date: Fri Feb 20 17:22:28 2015 New Revision: 379453 URL: https://svnweb.freebsd.org/changeset/ports/379453 QAT: https://qat.redports.org/buildarchive/r379453/ Log: www/tengine: multiple fixes - Fix building issue when using custom port options - Fix problem with agentzh modules moved by upstream to openresty repo - Convert to @dir usage - Add LICENSE FILE - Pet portlint PR: 196002 Added: head/www/tengine/files/extra-patch-openresty-set-misc-nginx-module-config - copied, changed from r379343, head/www/tengine/files/extra-patch-agentzh-set-misc-nginx-module-config Deleted: head/www/tengine/files/extra-patch-agentzh-set-misc-nginx-module-config Modified: head/www/tengine/Makefile head/www/tengine/distinfo head/www/tengine/pkg-plist Modified: head/www/tengine/Makefile ============================================================================== --- head/www/tengine/Makefile Fri Feb 20 17:16:12 2015 (r379452) +++ head/www/tengine/Makefile Fri Feb 20 17:22:28 2015 (r379453) @@ -3,14 +3,16 @@ PORTNAME= tengine PORTVERSION= 2.0.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www MASTER_SITES= GH +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= robak@FreeBSD.org -COMMENT= Robust and small WWW server forked from nginx by Taobao +COMMENT= Robust and small WWW server forked from Nginx LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE WANT_GNOME= yes USE_GNOME= libxml2 libxslt @@ -326,17 +328,17 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/n .if ${PORT_OPTIONS:MECHO} NGINX_ECHO_VERSION= 0.50 GIT_ECHO_VERSION= 0-gf827a4f -MASTER_SITES+= https://github.com/agentzh/echo-nginx-module/tarball/v${NGINX_ECHO_VERSION}/:echo -DISTFILES+= agentzh-echo-nginx-module-v${NGINX_ECHO_VERSION}-${GIT_ECHO_VERSION}.tar.gz:echo -CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-echo-nginx-module-${GIT_ECHO_VERSION:S/^0-g//} +MASTER_SITES+= https://github.com/openresty/echo-nginx-module/tarball/v${NGINX_ECHO_VERSION}/:echo +DISTFILES+= openresty-echo-nginx-module-v${NGINX_ECHO_VERSION}-${GIT_ECHO_VERSION}.tar.gz:echo +CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-echo-nginx-module-${GIT_ECHO_VERSION:S/^0-g//} .endif .if ${PORT_OPTIONS:MHEADERS_MORE} NGINX_HEADERS_MORE_VERSION= 0.24 GIT_HEADERS_MORE_VERSION= 0-g7a6fd11 -MASTER_SITES+= https://github.com/agentzh/headers-more-nginx-module/tarball/v${NGINX_HEADERS_MORE_VERSION}/:headers_more -DISTFILES+= agentzh-headers-more-nginx-module-v${NGINX_HEADERS_MORE_VERSION}-${GIT_HEADERS_MORE_VERSION}.tar.gz:headers_more -CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-headers-more-nginx-module-${GIT_HEADERS_MORE_VERSION:S/^0-g//} +MASTER_SITES+= https://github.com/openresty/headers-more-nginx-module/tarball/v${NGINX_HEADERS_MORE_VERSION}/:headers_more +DISTFILES+= openresty-headers-more-nginx-module-v${NGINX_HEADERS_MORE_VERSION}-${GIT_HEADERS_MORE_VERSION}.tar.gz:headers_more +CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-headers-more-nginx-module-${GIT_HEADERS_MORE_VERSION:S/^0-g//} .endif .if ${PORT_OPTIONS:MHTTP_DAV} @@ -499,9 +501,9 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/s .if ${PORT_OPTIONS:MENCRYPTSESSION} NGINX_ENCRYPTSESSION_VERSION= 0.03 GIT_ENCRYPTSESSION_VERSION= 0-g49d741b -MASTER_SITES+= https://github.com/agentzh/encrypted-session-nginx-module/tarball/v${NGINX_ENCRYPTSESSION_VERSION}/:encryptsession -DISTFILES+= agentzh-encrypted-session-nginx-module-v${NGINX_ENCRYPTSESSION_VERSION}-${GIT_ENCRYPTSESSION_VERSION}.tar.gz:encryptsession -CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-encrypted-session-nginx-module-${GIT_ENCRYPTSESSION_VERSION:S/^0-g//} +MASTER_SITES+= https://github.com/openresty/encrypted-session-nginx-module/tarball/v${NGINX_ENCRYPTSESSION_VERSION}/:encryptsession +DISTFILES+= openresty-encrypted-session-nginx-module-v${NGINX_ENCRYPTSESSION_VERSION}-${GIT_ENCRYPTSESSION_VERSION}.tar.gz:encryptsession +CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-encrypted-session-nginx-module-${GIT_ENCRYPTSESSION_VERSION:S/^0-g//} .endif .if ${PORT_OPTIONS:MGRIDFS} @@ -527,9 +529,9 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/a .if ${PORT_OPTIONS:MMEMC} NGINX_MEMC_VERSION= 0.14 GIT_MEMC_VERSION= 0-gde4cf86 -MASTER_SITES+= https://github.com/agentzh/memc-nginx-module/tarball/v${NGINX_MEMC_VERSION}/:memc -DISTFILES+= agentzh-memc-nginx-module-v${NGINX_MEMC_VERSION}-${GIT_MEMC_VERSION}.tar.gz:memc -CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-memc-nginx-module-${GIT_MEMC_VERSION:S/^0-g//} +MASTER_SITES+= https://github.com/openresty/memc-nginx-module/tarball/v${NGINX_MEMC_VERSION}/:memc +DISTFILES+= openresty-memc-nginx-module-v${NGINX_MEMC_VERSION}-${GIT_MEMC_VERSION}.tar.gz:memc +CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-memc-nginx-module-${GIT_MEMC_VERSION:S/^0-g//} .endif .if ${PORT_OPTIONS:MMODSECURITY} @@ -561,25 +563,25 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch- .if ${PORT_OPTIONS:MRDS_CSV} NGINX_RDS_CSV_VERSION= 0.05 GIT_RDS_CSV_VERSION= 0-g607e26b -MASTER_SITES+= https://github.com/agentzh/rds-csv-nginx-module/tarball/v${NGINX_RDS_CSV_VERSION}/:rdscsv -DISTFILES+= agentzh-rds-csv-nginx-module-v${NGINX_RDS_CSV_VERSION}-${GIT_RDS_CSV_VERSION}.tar.gz:rdscsv -CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-rds-csv-nginx-module-${GIT_RDS_CSV_VERSION:S/^0-g//} +MASTER_SITES+= https://github.com/openresty/rds-csv-nginx-module/tarball/v${NGINX_RDS_CSV_VERSION}/:rdscsv +DISTFILES+= openresty-rds-csv-nginx-module-v${NGINX_RDS_CSV_VERSION}-${GIT_RDS_CSV_VERSION}.tar.gz:rdscsv +CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-rds-csv-nginx-module-${GIT_RDS_CSV_VERSION:S/^0-g//} .endif .if ${PORT_OPTIONS:MRDS_JSON} NGINX_RDS_JSON_VERSION= 0.13 GIT_RDS_JSON_VERSION= 0-g8292070 -MASTER_SITES+= https://github.com/agentzh/rds-json-nginx-module/tarball/v${NGINX_RDS_JSON_VERSION}/:rdsjson -DISTFILES+= agentzh-rds-json-nginx-module-v${NGINX_RDS_JSON_VERSION}-${GIT_RDS_JSON_VERSION}.tar.gz:rdsjson -CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-rds-json-nginx-module-${GIT_RDS_JSON_VERSION:S/^0-g//} +MASTER_SITES+= https://github.com/openresty/rds-json-nginx-module/tarball/v${NGINX_RDS_JSON_VERSION}/:rdsjson +DISTFILES+= openresty-rds-json-nginx-module-v${NGINX_RDS_JSON_VERSION}-${GIT_RDS_JSON_VERSION}.tar.gz:rdsjson +CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-rds-json-nginx-module-${GIT_RDS_JSON_VERSION:S/^0-g//} .endif .if ${PORT_OPTIONS:MREDIS2} NGINX_REDIS2_VERSION= 0.10 GIT_REDIS2_VERSION= 0-g78a7622 -MASTER_SITES+= https://github.com/agentzh/redis2-nginx-module/tarball/v${NGINX_REDIS2_VERSION}/:redis2 -DISTFILES+= agentzh-redis2-nginx-module-v${NGINX_REDIS2_VERSION}-${GIT_REDIS2_VERSION}.tar.gz:redis2 -CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-redis2-nginx-module-${GIT_REDIS2_VERSION:S/^0-g//} +MASTER_SITES+= https://github.com/openresty/redis2-nginx-module/tarball/v${NGINX_REDIS2_VERSION}/:redis2 +DISTFILES+= openresty-redis2-nginx-module-v${NGINX_REDIS2_VERSION}-${GIT_REDIS2_VERSION}.tar.gz:redis2 +CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-redis2-nginx-module-${GIT_REDIS2_VERSION:S/^0-g//} .endif .if ${PORT_OPTIONS:MRTMP} @@ -592,10 +594,10 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/n .if ${PORT_OPTIONS:MSET_MISC} NGINX_SET_MISC_VERSION= 0.23 GIT_SET_MISC_VERSION= 0-g6ce586e -MASTER_SITES+= https://github.com/agentzh/set-misc-nginx-module/tarball/v${NGINX_SET_MISC_VERSION}/:setmisc -DISTFILES+= agentzh-set-misc-nginx-module-v${NGINX_SET_MISC_VERSION}-${GIT_SET_MISC_VERSION}.tar.gz:setmisc -CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-set-misc-nginx-module-${GIT_SET_MISC_VERSION:S/^0-g//} -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-agentzh-set-misc-nginx-module-config +MASTER_SITES+= https://github.com/openresty/set-misc-nginx-module/tarball/v${NGINX_SET_MISC_VERSION}/:setmisc +DISTFILES+= openresty-set-misc-nginx-module-v${NGINX_SET_MISC_VERSION}-${GIT_SET_MISC_VERSION}.tar.gz:setmisc +CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-set-misc-nginx-module-${GIT_SET_MISC_VERSION:S/^0-g//} +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-openresty-set-misc-nginx-module-config .endif .if ${PORT_OPTIONS:MSFLOW} @@ -617,9 +619,9 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/n .if ${PORT_OPTIONS:MSRCACHE} NGINX_SRCACHE_VERSION= 0.24 GIT_SRCACHE_VERSION= 0-g33f0f29 -MASTER_SITES+= https://github.com/agentzh/srcache-nginx-module/tarball/v${NGINX_SRCACHE_VERSION}/:srcache -DISTFILES+= agentzh-srcache-nginx-module-v${NGINX_SRCACHE_VERSION}-${GIT_SRCACHE_VERSION}.tar.gz:srcache -CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-srcache-nginx-module-${GIT_SRCACHE_VERSION:S/^0-g//} +MASTER_SITES+= https://github.com/openresty/srcache-nginx-module/tarball/v${NGINX_SRCACHE_VERSION}/:srcache +DISTFILES+= openresty-srcache-nginx-module-v${NGINX_SRCACHE_VERSION}-${GIT_SRCACHE_VERSION}.tar.gz:srcache +CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-srcache-nginx-module-${GIT_SRCACHE_VERSION:S/^0-g//} .endif .if ${PORT_OPTIONS:MSUPERVISORD} @@ -647,13 +649,13 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/g .if ${PORT_OPTIONS:MXSS} NGINX_XSS_VERSION= 0.04 GIT_XSS_VERSION= 0-g7e37038 -MASTER_SITES+= https://github.com/agentzh/xss-nginx-module/tarball/v${NGINX_XSS_VERSION}/:xss -DISTFILES+= agentzh-xss-nginx-module-v${NGINX_XSS_VERSION}-${GIT_XSS_VERSION}.tar.gz:xss -CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-xss-nginx-module-${GIT_XSS_VERSION:S/^0-g//} +MASTER_SITES+= https://github.com/openresty/xss-nginx-module/tarball/v${NGINX_XSS_VERSION}/:xss +DISTFILES+= openresty-xss-nginx-module-v${NGINX_XSS_VERSION}-${GIT_XSS_VERSION}.tar.gz:xss +CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-xss-nginx-module-${GIT_XSS_VERSION:S/^0-g//} .endif .if ${PORT_OPTIONS:MSPDY} -WITH_HTTP_SSL= yes +WITH_HTTP_SSL= yes CONFIGURE_ARGS+=--with-http_spdy_module .endif @@ -697,9 +699,9 @@ CONFIGURE_ARGS+=--with-mail_ssl_module .if ${PORT_OPTIONS:MARRAYVAR} NGINX_ARRAYVAR_VERSION= 0.03 GIT_ARRAYVAR_VERSION= 0-g4676747 -MASTER_SITES+= https://github.com/agentzh/array-var-nginx-module/tarball/v${NGINX_ARRAYVAR_VERSION}/:arrayvar -DISTFILES+= agentzh-array-var-nginx-module-v${NGINX_ARRAYVAR_VERSION}-${GIT_ARRAYVAR_VERSION}.tar.gz:arrayvar -CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-array-var-nginx-module-${GIT_ARRAYVAR_VERSION:S/^0-g//} +MASTER_SITES+= https://github.com/openresty/array-var-nginx-module/tarball/v${NGINX_ARRAYVAR_VERSION}/:arrayvar +DISTFILES+= openresty-array-var-nginx-module-v${NGINX_ARRAYVAR_VERSION}-${GIT_ARRAYVAR_VERSION}.tar.gz:arrayvar +CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-array-var-nginx-module-${GIT_ARRAYVAR_VERSION:S/^0-g//} .endif .if ${PORT_OPTIONS:MFORMINPUT} @@ -735,10 +737,10 @@ CONFIGURE_ARGS+=--without-http_rewrite_m .endif .if defined(NGINX_OPENSSL) -USE_OPENSSL= yes +USE_OPENSSL= yes .if ${PORT_OPTIONS:MSPDY} .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000028 -WITH_OPENSSL_PORT= yes +WITH_OPENSSL_PORT= yes .endif .endif .endif @@ -803,8 +805,8 @@ post-patch: .endif .if ${PORT_OPTIONS:MSPDY} .if ${PORT_OPTIONS:MDRIZZLE} - @${REINPLACE_CMD} '584d' \ - ${WRKDIR}/chaoslawful-drizzle-nginx-module-${GIT_DRIZZLE_VERSION:S/^0-g//}/src/ngx_http_drizzle_util.c + @${REINPLACE_CMD} '584d' \ + ${WRKDIR}/chaoslawful-drizzle-nginx-module-${GIT_DRIZZLE_VERSION:S/^0-g//}/src/ngx_http_drizzle_util.c .endif .endif .if ${PORT_OPTIONS:MSUPERVISORD} @@ -887,6 +889,6 @@ post-install: ${ECHO_CMD} ${SITE_ARCH_REL}/nginx.pm >> ${TMPPLIST} ${ECHO_CMD} @dirrm ${SITE_ARCH_REL}/auto/nginx >> ${TMPPLIST} .endif - @${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 .include Modified: head/www/tengine/distinfo ============================================================================== --- head/www/tengine/distinfo Fri Feb 20 17:16:12 2015 (r379452) +++ head/www/tengine/distinfo Fri Feb 20 17:22:28 2015 (r379453) @@ -14,10 +14,10 @@ SHA256 (ngx_http_auth_request_module-0.2 SIZE (ngx_http_auth_request_module-0.2.tar.gz) = 6736 SHA256 (ngx_cache_purge-2.1.tar.gz) = 424005af0c04e59ffa65a65e446081d4f95ee76a801a7555e001c67810bcb3b9 SIZE (ngx_cache_purge-2.1.tar.gz) = 10535 -SHA256 (agentzh-echo-nginx-module-v0.50-0-gf827a4f.tar.gz) = 0121dd5a8053d6960c9acc364f7552db1bcc64aa4340d0bf7f6d09d3125cfbe9 -SIZE (agentzh-echo-nginx-module-v0.50-0-gf827a4f.tar.gz) = 62907 -SHA256 (agentzh-headers-more-nginx-module-v0.24-0-g7a6fd11.tar.gz) = 1bc8e48da5c6b9968620114776be2751ab600c7953a04c08e16901de3ef2aec2 -SIZE (agentzh-headers-more-nginx-module-v0.24-0-g7a6fd11.tar.gz) = 27666 +SHA256 (openresty-echo-nginx-module-v0.50-0-gf827a4f.tar.gz) = 3bce25d45b81a9d0c44b918b8566b4b43b77ef877f5f6cde3175df82fd1bf097 +SIZE (openresty-echo-nginx-module-v0.50-0-gf827a4f.tar.gz) = 62916 +SHA256 (openresty-headers-more-nginx-module-v0.24-0-g7a6fd11.tar.gz) = e8575a05ffcb9887a6c0124d7db2dad53d475e733b9ce9f4507e40e5428f86ce +SIZE (openresty-headers-more-nginx-module-v0.24-0-g7a6fd11.tar.gz) = 27673 SHA256 (arut-nginx-dav-ext-module-v0.0.2-0-g0e07a3e.tar.gz) = a0d6fa256e354ce48c06e1f689d26ebb2f7b75f71ce682e34ae6c29331a7fbff SIZE (arut-nginx-dav-ext-module-v0.0.2-0-g0e07a3e.tar.gz) = 6065 SHA256 (vkholodkov-nginx-eval-module-1.0.3-0-g125fa2e.tar.gz) = 945046c42d973be9293e03ab41e3a0e04677524b2cd813cfc5146cf1d2f0ab8f @@ -50,46 +50,46 @@ SHA256 (chaoslawful-drizzle-nginx-module SIZE (chaoslawful-drizzle-nginx-module-v0.1.6-0-ge6937ba.tar.gz) = 61351 SHA256 (simpl-ngx_devel_kit-v0.2.19-0-g8dd0df5.tar.gz) = 9a8c372f8e750d33018d9587d288c17f755e8da38592bca8ef9bf9ea4bab59a7 SIZE (simpl-ngx_devel_kit-v0.2.19-0-g8dd0df5.tar.gz) = 65033 -SHA256 (agentzh-encrypted-session-nginx-module-v0.03-0-g49d741b.tar.gz) = 4485214756dc935a959efd3a2fcd750263df1719956a4ac73f96b0cee0763395 -SIZE (agentzh-encrypted-session-nginx-module-v0.03-0-g49d741b.tar.gz) = 8947 +SHA256 (openresty-encrypted-session-nginx-module-v0.03-0-g49d741b.tar.gz) = 0c8b74f2fbe6114f6d59fecbf3539f5d13944f40895d1c379fdb5dfb0838c1e3 +SIZE (openresty-encrypted-session-nginx-module-v0.03-0-g49d741b.tar.gz) = 8954 SHA256 (mdirolf-nginx-gridfs-v0.8-0-gb5f8113.tar.gz) = f55617873c9b123d610d59e4da52703c07be0bae5c719ef0cc3d45a53480d29c SIZE (mdirolf-nginx-gridfs-v0.8-0-gb5f8113.tar.gz) = 18882 SHA256 (mongodb-mongo-c-driver-v0.3.1-0-g9b4b232.tar.gz) = bfcdd60c6b53bd499e2bf22fefc96848de37e7d57dfaf7303bb00376dcb812f0 SIZE (mongodb-mongo-c-driver-v0.3.1-0-g9b4b232.tar.gz) = 53033 SHA256 (arut-nginx-let-module-v0.0.4-0-ga5e1dc5.tar.gz) = 9253581f11966329f64b4b4a49a2a60798665812f9007222592586e64bcd66da SIZE (arut-nginx-let-module-v0.0.4-0-ga5e1dc5.tar.gz) = 20543 -SHA256 (agentzh-memc-nginx-module-v0.14-0-gde4cf86.tar.gz) = 5e8cacd7af42685794bbe121264173de4141e5746031e23f8e363ab14ccb1534 -SIZE (agentzh-memc-nginx-module-v0.14-0-gde4cf86.tar.gz) = 37755 +SHA256 (openresty-memc-nginx-module-v0.14-0-gde4cf86.tar.gz) = b60fed5921a0c19c6ffe71e5c764193283dbe635bb3bad6febd6655f94a633e9 +SIZE (openresty-memc-nginx-module-v0.14-0-gde4cf86.tar.gz) = 37756 SHA256 (modsecurity-apache_2.7.5.tar.gz) = 9e907536278d8da80d3dbb29aeffe9c4ec37ce9b641035b2da64e993135647a2 SIZE (modsecurity-apache_2.7.5.tar.gz) = 1045387 SHA256 (ngx_postgres-0.9.tar.gz) = aac0141e73b5c440927b7e040072f120b36e49deb2ff36ad00ff96a80622fbec SIZE (ngx_postgres-0.9.tar.gz) = 41022 -SHA256 (agentzh-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = 3fa9cb3960a97f505c9ad0cc8683c8fe17ba98aa98d003e255bf214e5144751c -SIZE (agentzh-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = 18423 -SHA256 (agentzh-rds-json-nginx-module-v0.13-0-g8292070.tar.gz) = 9e59b90d84f9bc814eba85bfcf126e3fd6406ddc771702c096a657c17354c302 -SIZE (agentzh-rds-json-nginx-module-v0.13-0-g8292070.tar.gz) = 32965 -SHA256 (agentzh-redis2-nginx-module-v0.10-0-g78a7622.tar.gz) = c2a164df07759d2a45beacc1f72316be84e9348b7ae5509723eabd2d61cb4897 -SIZE (agentzh-redis2-nginx-module-v0.10-0-g78a7622.tar.gz) = 29850 +SHA256 (openresty-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = d5f14e45c6dc0d039ad52ae889775b5af1ff80a1c8edb69361c1581aca5d0b8f +SIZE (openresty-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = 18416 +SHA256 (openresty-rds-json-nginx-module-v0.13-0-g8292070.tar.gz) = e0813f2d1e0d499c4f44f7957253c7804ccc0d3a7d4446ac0c6eec834e9c21f4 +SIZE (openresty-rds-json-nginx-module-v0.13-0-g8292070.tar.gz) = 32961 +SHA256 (openresty-redis2-nginx-module-v0.10-0-g78a7622.tar.gz) = 76606bf3b548b072f8a6426033c115d013c52068f174f61d21c671435087e97d +SIZE (openresty-redis2-nginx-module-v0.10-0-g78a7622.tar.gz) = 29850 SHA256 (rtmp-nginx-module-v1.0.8.tar.gz) = e905e40d1a1b81c720f1e799bee6a3525efaa6f2519212130d39eed3b8877c74 SIZE (rtmp-nginx-module-v1.0.8.tar.gz) = 513086 -SHA256 (agentzh-set-misc-nginx-module-v0.23-0-g6ce586e.tar.gz) = a5dea4570efa138e15bb97babb02e76f16319b4b660763492ef02615dc1def1f -SIZE (agentzh-set-misc-nginx-module-v0.23-0-g6ce586e.tar.gz) = 40355 +SHA256 (openresty-set-misc-nginx-module-v0.23-0-g6ce586e.tar.gz) = 23fadb942f64775bfa7b568d52f8adab01260c8ad95bbeb44af8e7ea5b87e349 +SIZE (openresty-set-misc-nginx-module-v0.23-0-g6ce586e.tar.gz) = 40336 SHA256 (nginx-sflow-module-0.9.7.tar.gz) = 508d15a43059abab08281bfa66d2dd520e2e7635d0b17043549bb331c8755b76 SIZE (nginx-sflow-module-0.9.7.tar.gz) = 27614 SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1 SIZE (ngx_slowfs_cache-1.10.tar.gz) = 11809 -SHA256 (agentzh-srcache-nginx-module-v0.24-0-g33f0f29.tar.gz) = 5e3f59821f73c205e1df0c40fd02d987b21b19e3c267866659f883bddd5674c9 -SIZE (agentzh-srcache-nginx-module-v0.24-0-g33f0f29.tar.gz) = 67239 +SHA256 (openresty-srcache-nginx-module-v0.24-0-g33f0f29.tar.gz) = dbf003980f39ff8f21b304a5463691746b9adc9d2e745d0de809c5b1713246cd +SIZE (openresty-srcache-nginx-module-v0.24-0-g33f0f29.tar.gz) = 67245 SHA256 (ngx_supervisord-1.4.tar.gz) = 0954a4efb1b955692acf523e169221146d6aa93ad1643c9f2482f75a1fbf9e3b SIZE (ngx_supervisord-1.4.tar.gz) = 19351 SHA256 (yaoweibin-nginx_tcp_proxy_module-v0.26-0-gb83e5a6.tar.gz) = 4d843b8d0511b269382938ba5546f902ec24dbfa76c12f6bd6961d7aaaf3866a SIZE (yaoweibin-nginx_tcp_proxy_module-v0.26-0-gb83e5a6.tar.gz) = 127346 SHA256 (gabor-nginx-x-rid-header-0daa3cc.tar.gz) = 136239b8f9ab2fbefb2aabc6897d3f12cc8063ce817901f9b8a624e12fbc6035 SIZE (gabor-nginx-x-rid-header-0daa3cc.tar.gz) = 2714 -SHA256 (agentzh-xss-nginx-module-v0.04-0-g7e37038.tar.gz) = 3e5b1eba411e1e51bbb197d2adb2d5304cd4050dca95f506cae635e4af5e9b35 -SIZE (agentzh-xss-nginx-module-v0.04-0-g7e37038.tar.gz) = 10535 -SHA256 (agentzh-array-var-nginx-module-v0.03-0-g4676747.tar.gz) = 9670207b5a74ddbdf510b973ddbcf3e4ecd4c5fe50829b17c560ba4a30aa73f4 -SIZE (agentzh-array-var-nginx-module-v0.03-0-g4676747.tar.gz) = 9518 +SHA256 (openresty-xss-nginx-module-v0.04-0-g7e37038.tar.gz) = 0199bc3b53269f49073365fe08dc2c02decbaea614dc33db4666c7ab2cdb8bfa +SIZE (openresty-xss-nginx-module-v0.04-0-g7e37038.tar.gz) = 10542 +SHA256 (openresty-array-var-nginx-module-v0.03-0-g4676747.tar.gz) = bc33d26af3f01882a187b312c27fb547f802eb36eedfa7d2caedf3ed9c424442 +SIZE (openresty-array-var-nginx-module-v0.03-0-g4676747.tar.gz) = 9518 SHA256 (calio-form-input-nginx-module-v0.07-0-g78de845.tar.gz) = d5b2c42a3b9fd2970107eb74c2226cbbfbad48c89807303db903932d21ff76aa SIZE (calio-form-input-nginx-module-v0.07-0-g78de845.tar.gz) = 10580 SHA256 (calio-iconv-nginx-module-v0.10-0-gb37efb5.tar.gz) = e90a406a14d5f419bd500e19082da81390e8ba6040926857926f1a899a53379d Copied and modified: head/www/tengine/files/extra-patch-openresty-set-misc-nginx-module-config (from r379343, head/www/tengine/files/extra-patch-agentzh-set-misc-nginx-module-config) ============================================================================== --- head/www/tengine/files/extra-patch-agentzh-set-misc-nginx-module-config Thu Feb 19 13:23:06 2015 (r379343, copy source) +++ head/www/tengine/files/extra-patch-openresty-set-misc-nginx-module-config Fri Feb 20 17:22:28 2015 (r379453) @@ -1,5 +1,5 @@ ---- ../agentzh-set-misc-nginx-module-6ce586e/config.orig 2011-12-09 10:27:53.861265188 +0300 -+++ ../agentzh-set-misc-nginx-module-6ce586e/config 2011-12-09 10:28:07.107259301 +0300 +--- ../openresty-set-misc-nginx-module-6ce586e/config.orig 2011-12-09 10:27:53.861265188 +0300 ++++ ../openresty-set-misc-nginx-module-6ce586e/config 2011-12-09 10:28:07.107259301 +0300 @@ -1,10 +1,3 @@ -if echo $HTTP_MODULES | grep " ndk_http_module" > /dev/null; then - echo "found ngx_devel_kit for ngx_set_misc; looks good." Modified: head/www/tengine/pkg-plist ============================================================================== --- head/www/tengine/pkg-plist Fri Feb 20 17:16:12 2015 (r379452) +++ head/www/tengine/pkg-plist Fri Feb 20 17:22:28 2015 (r379453) @@ -14,7 +14,7 @@ %%ETCDIR%%/mime.types-dist @exec if [ ! -f %D/%%ETCDIR%%/mime.types ] ; then cp -p %D/%F %B/mime.types && chmod u+w %B/mime.types; fi @unexec if cmp -s %D/%%ETCDIR%%/nginx.conf-dist %D/%%ETCDIR%%/nginx.conf; then rm -f %D/%%ETCDIR%%/nginx.conf; fi -@dirrmtry %%ETCDIR%% +@dir %%ETCDIR%% %%ETCDIR%%/nginx.conf-dist @exec if [ ! -f %D/%%ETCDIR%%/nginx.conf ] ; then cp -p %D/%F %B/nginx.conf && chmod u+w %B/nginx.conf; fi @exec if [ ! -d %%NGINX_TMPDIR%% ] ; then mkdir %%NGINX_TMPDIR%%; fi @@ -25,7 +25,7 @@ %%WWWDATA%%www/nginx-dist/50x.html %%WWWDATA%%@exec chmod a-w %D/www/nginx-dist %%WWWDATA%%@unexec if [ -L %D/www/nginx ]; then rm -f %D/www/nginx; fi -%%WWWDATA%%@dirrmtry www/nginx-dist +%%WWWDATA%%@dir www/nginx-dist %%ETCDIR%%/include/ddebug.h %%ETCDIR%%/include/nginx.h %%ETCDIR%%/include/ngx_alloc.h @@ -200,6 +200,6 @@ sbin/nginx sbin/dso_tool @unexec if [ -z ${UPGRADE_PORT} ] ; then rm -fr %%NGINX_TMPDIR%%; fi man/man8/nginx.8.gz -@dirrmtry %%ETCDIR%%/modules -@dirrmtry %%ETCDIR%%/include -@dirrmtry %%NGINX_TMPDIR%% +@dir %%ETCDIR%%/modules +@dir %%ETCDIR%%/include +@dir %%NGINX_TMPDIR%%