mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00
Code Issues Releases Activity

Updated syslog support and upstream_sticky options to re-enable them.

Browse Source 
PR:             189391
Submitted by:   dgeo@centrale-marseille.fr
Approved by:    maintainer timeout
This commit is contained in:
Erwin Lansing 2014-06-16 09:55:53 +00:00
parent 5ef3704c89
commit c97006c012
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=357965
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
www/nginx/Makefile
View File

@ -535,12 +535,11 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_upstream.h
.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}
@ -742,10 +741,11 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_supervisord-${NGINX_SUPERVISORD_VERSI
.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}
@ -952,6 +952,11 @@ post-patch:
${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' \

5
www/nginx/distinfo
View File

@ -112,3 +112,8 @@ SHA256 (calio-form-input-nginx-module-v0.07-0-g78de845.tar.gz) = d5b2c42a3b9fd29
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