From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 6 11:50:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DC40C2A6 for ; Tue, 6 May 2014 11:50:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 B6817CD9 for ; Tue, 6 May 2014 11:50:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s46Bo03R027554 for ; Tue, 6 May 2014 11:50:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s46Bo0CO027552; Tue, 6 May 2014 11:50:00 GMT (envelope-from gnats) Resent-Date: Tue, 6 May 2014 11:50:00 GMT Resent-Message-Id: <201405061150.s46Bo0CO027552@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Geoffroy Desvernay Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E06CB129; Tue, 6 May 2014 11:46:17 +0000 (UTC) Received: from melo.ec-m.fr (melo.ec-m.fr [147.94.19.37]) by mx1.freebsd.org (Postfix) with ESMTP id 6EA52C9E; Tue, 6 May 2014 11:46:17 +0000 (UTC) Received: from amavis2.serv.int (amavis2.serv.int [10.3.0.46]) by melo.ec-m.fr (GrosseBox 1743 XXL) with ESMTP id E7F79AC842; Tue, 6 May 2014 13:37:12 +0200 (CEST) Received: from melo.ec-m.fr ([10.3.0.13]) by amavis2.serv.int (amavis2.serv.int [10.3.0.46]) (amavisd-new, port 10024) with LMTP id vJ4hpfL_8iuS; Tue, 6 May 2014 13:37:05 +0200 (CEST) Received: from dgeo.sysadm.ec-m.fr (dgeo.sysadm.ec-m.fr [147.94.19.169]) by melo.ec-m.fr (GrosseBox 1743 XXL) with ESMTPS id BEC25AC8C2; Tue, 6 May 2014 13:37:05 +0200 (CEST) Received: (from root@localhost) by dgeo.sysadm.ec-m.fr (8.14.7/8.14.7/Submit) id s46Bb519079499; Tue, 6 May 2014 13:37:05 +0200 (CEST) (envelope-from dgeo) Message-Id: <201405061137.s46Bb519079499@dgeo.sysadm.ec-m.fr> Date: Tue, 6 May 2014 13:37:05 +0200 (CEST) From: Geoffroy Desvernay To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/189391: [PATCH] www/nginx: update syslog and upstream_sticky modules Cc: osa@FreeBSD.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 May 2014 11:50:00 -0000 >Number: 189391 >Category: ports >Synopsis: [PATCH] www/nginx: update syslog and upstream_sticky modules >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue May 06 11:50:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Geoffroy Desvernay >Release: FreeBSD 10.0-RELEASE-p2 amd64 >Organization: Ecole Centrale de Marseille >Environment: System: FreeBSD dgeo.sysadm.ec-m.fr 10.0-RELEASE-p2 FreeBSD 10.0-RELEASE-p2 #0: Tue Apr 29 17:06:01 UTC 2014 >Description: Updated syslog support and upstream_sticky options to re-enable them. Port maintainer (osa@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 1.02 (mode: change, diff: SVN) >How-To-Repeat: These options were disabled and marked 'need update' >Fix: Update attached :) --- nginx-1.6.0.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 353083) +++ Makefile (working copy) @@ -534,12 +534,11 @@ .endif .if ${PORT_OPTIONS:MHTTP_UPSTREAM_STICKY} -IGNORE= STICKY: update require USE_HTTP_SSL= yes -NGINX_UPSTREAM_STICKY_VERSION= 1.1 -MASTER_SITES+= http://nginx-sticky-module.googlecode.com/files/:upstreamsticky -DISTFILES+= nginx-sticky-module-${NGINX_UPSTREAM_STICKY_VERSION}.tar.gz:upstreamsticky -CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-sticky-module-${NGINX_UPSTREAM_STICKY_VERSION} +NGINX_UPSTREAM_STICKY_VERSION= 1.2.4 +MASTER_SITES+= https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/:upstreamsticky +DISTFILES+= ${NGINX_UPSTREAM_STICKY_VERSION}.tar.gz:upstreamsticky +CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-goodies-nginx-sticky-module-ng-c825ea7c5c91/ .endif .if ${PORT_OPTIONS:MHTTP_XSLT} @@ -741,10 +740,11 @@ .endif .if ${PORT_OPTIONS:MSYSLOG_SUPPORT} -IGNORE= SYSLOG: update require -NGINX_SYSLOG_SUPPORT_FACILITY?= LOG_DAEMON -CONFIGURE_ARGS+=--with-syslog --with-syslog-facility=${NGINX_SYSLOG_SUPPORT_FACILITY} -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-syslog_support +#GIT_SYSLOG_PATCH_VERSION=3ca5ba65541637f74467038aa032e2586321d0cb +GIT_SYSLOG_PATCH_VERSION=3ca5ba6 +MASTER_SITES+= https://github.com/yaoweibin/nginx_syslog_patch/tarball/${GIT_SYSLOG_PATCH_VERSION}/:syslog_patch +DISTFILES+= nginx_syslog_patch-${GIT_SYSLOG_PATCH_VERSION}.tar.gz:syslog_patch +CONFIGURE_ARGS+= --add-module=${WRKDIR}/yaoweibin-nginx_syslog_patch-${GIT_SYSLOG_PATCH_VERSION} .endif .if ${PORT_OPTIONS:MTCP_PROXY} @@ -951,6 +951,11 @@ ${PATCH} -p1 < \ ${WRKDIR}/yaoweibin-nginx_tcp_proxy_module-${GIT_TCP_PROXY_VERSION:S/^0-g//}/tcp.patch ) .endif +.if ${PORT_OPTIONS:MSYSLOG_SUPPORT} + ( cd ${WRKSRC} && \ + ${PATCH} -p1 < \ + ${WRKDIR}/yaoweibin-nginx_syslog_patch-${GIT_SYSLOG_PATCH_VERSION}/syslog-1.5.6.patch ) +.endif .if ${PORT_OPTIONS:MICONV} @${REINPLACE_CMD} \ 's!%%PREFIX%%!${LOCALBASE}!g' \ Index: distinfo =================================================================== --- distinfo (revision 353083) +++ distinfo (working copy) @@ -112,3 +112,7 @@ 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 SIZE (calio-iconv-nginx-module-v0.10-0-gb37efb5.tar.gz) = 12510 +SHA256 (1.2.4.tar.gz) = f79521a25322cb4f504547a0b0f76fd9d024c14440e5d790e26dda70ea4f701a +SIZE (1.2.4.tar.gz) = 120448 +SHA256 (nginx_syslog_patch-3ca5ba6.tar.gz) = 817a207f2cb18f3035f5535bd03942390010dbade03c4a5d3d0d97b55e1f3deb +SIZE (nginx_syslog_patch-3ca5ba6.tar.gz) = 94400 --- nginx-1.6.0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: