From 8e6c1f6743ea7fc77cf94d77ac434486563fe50e Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 5 Dec 2017 05:55:20 +0100 Subject: [PATCH] */*: sync with upstream Taken from: HardenedBSD --- biology/fasttree/Makefile | 23 +--- biology/fasttree/distinfo | 5 +- biology/fasttree/files/Makefile | 25 ++++ .../fasttree/files/patch-FastTree-2.1.10.c | 11 ++ biology/py-macs2/Makefile | 4 +- comms/mlan3/Makefile | 2 + databases/redis-devel/Makefile | 2 +- databases/redis-devel/distinfo | 6 +- deskutils/cycle/Makefile | 2 +- devel/boaconstructor/Makefile | 2 +- devel/cvs-syncmail/Makefile | 15 +-- devel/doxygen/Makefile | 2 +- devel/libcfg/Makefile | 3 +- devel/osc/distinfo | 6 +- devel/py-ocempgui/Makefile | 8 +- devel/shiboken/Makefile | 2 +- emulators/citra/Makefile | 10 +- emulators/citra/distinfo | 14 +- emulators/ppsspp/Makefile | 4 +- emulators/ppsspp/distinfo | 10 +- emulators/rpcs3/Makefile | 4 +- emulators/rpcs3/distinfo | 6 +- games/brainworkshop/Makefile | 2 +- games/pysycache/Makefile | 2 +- mail/maildrop/Makefile | 2 +- mail/maildrop/distinfo | 6 +- mail/sympa/Makefile | 2 +- math/clarence/Makefile | 2 +- math/glpk/Makefile | 4 +- math/glpk/distinfo | 6 +- math/glpk/pkg-plist | 2 +- multimedia/devede/Makefile | 2 +- net/tucan/Makefile | 4 +- ports-mgmt/poudriere-devel/Makefile | 6 +- ports-mgmt/poudriere-devel/distinfo | 6 +- security/dsniff/Makefile | 1 + security/spike-proxy/Makefile | 5 +- shells/fish/Makefile | 2 + www/mod_pagespeed/Makefile | 9 +- ...rc_core_lib_tsi_ssl__transport__security.c | 15 +++ ...third__party_serf_instaweb__ssl__buckets.c | 18 +++ ...atch-third__party_serf_select__openssl.gyp | 14 +- .../files/patch-third__party_serf_serf.diff | 27 ++++ www/nginx-devel/Makefile | 48 ++++--- www/nginx-devel/distinfo | 40 +++--- .../extra-patch-ngx_http_echo_request_info.c | 43 ------ .../files/extra-patch-ngx_http_lua_common.h | 15 --- .../files/extra-patch-ngx_http_lua_headers.c | 124 ------------------ .../files/extra-patch-ngx_http_lua_headers.h | 12 -- .../files/extra-patch-ngx_http_lua_ssl_ocsp.c | 12 -- .../files/extra-patch-ngx_http_redis2_util.c | 18 --- .../extra-patch-ngx_http_tarantool-config | 30 +++-- www/p5-Catalyst-View-JSON/Makefile | 5 +- www/p5-Catalyst-View-JSON/distinfo | 5 +- www/py-flexget/Makefile | 2 +- www/py-flexget/distinfo | 6 +- www/waterfox/Makefile | 5 +- www/waterfox/distinfo | 6 +- www/waterfox/files/patch-typos | 11 -- x11-toolkits/py-wax/Makefile | 2 +- x11/wbarconf/Makefile | 2 +- x11/xcurs/Makefile | 4 +- 62 files changed, 286 insertions(+), 407 deletions(-) create mode 100644 biology/fasttree/files/Makefile create mode 100644 biology/fasttree/files/patch-FastTree-2.1.10.c create mode 100644 www/mod_pagespeed/files/patch-third__party_serf_instaweb__ssl__buckets.c create mode 100644 www/mod_pagespeed/files/patch-third__party_serf_serf.diff delete mode 100644 www/nginx-devel/files/extra-patch-ngx_http_echo_request_info.c delete mode 100644 www/nginx-devel/files/extra-patch-ngx_http_lua_common.h delete mode 100644 www/nginx-devel/files/extra-patch-ngx_http_lua_headers.c delete mode 100644 www/nginx-devel/files/extra-patch-ngx_http_lua_headers.h delete mode 100644 www/nginx-devel/files/extra-patch-ngx_http_lua_ssl_ocsp.c delete mode 100644 www/nginx-devel/files/extra-patch-ngx_http_redis2_util.c diff --git a/biology/fasttree/Makefile b/biology/fasttree/Makefile index 617ac37291d..ed3311adefd 100644 --- a/biology/fasttree/Makefile +++ b/biology/fasttree/Makefile @@ -1,34 +1,23 @@ -# Created by: Jason Bacon # $FreeBSD$ PORTNAME= FastTree -PORTVERSION= 2.1.8 -PORTREVISION= 3 +DISTVERSION= 2.1.10 CATEGORIES= biology MASTER_SITES= http://www.microbesonline.org/fasttree/ EXTRACT_SUFX= .c -MAINTAINER= bacon4000@gmail.com +MAINTAINER= jwb@FreeBSD.org COMMENT= Approximately-maximum-likelihood phylogenetic trees from alignments -# LICENSE= unspecified open source +LICENSE= GPLv2+ USES= compiler:openmp -CFLAGS+= -DOPENMP -fopenmp -O3 -finline-functions -funroll-loops -LDFLAGS+= -lm - +NO_WRKSUBDIR= yes PLIST_FILES= bin/FastTree do-extract: - ${MKDIR} ${WRKSRC} - ${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC} - -do-build: - cd ${WRKSRC} && ${CC} ${CFLAGS} -o FastTree ${DISTFILES} ${LDFLAGS} - -do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/FastTree ${STAGEDIR}${PREFIX}/bin + @${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC} + @${CP} ${FILESDIR}/Makefile ${WRKSRC} .include diff --git a/biology/fasttree/distinfo b/biology/fasttree/distinfo index abd99c4d0c3..2777da14852 100644 --- a/biology/fasttree/distinfo +++ b/biology/fasttree/distinfo @@ -1,2 +1,3 @@ -SHA256 (FastTree-2.1.8.c) = b172d160f1b12b764d21a6937c3ce01ba42fa8743d95e083e031c6947762f837 -SIZE (FastTree-2.1.8.c) = 385231 +TIMESTAMP = 1512317739 +SHA256 (FastTree-2.1.10.c) = 54cb89fc1728a974a59eae7a7ee6309cdd3cddda9a4c55b700a71219fc6e926d +SIZE (FastTree-2.1.10.c) = 390916 diff --git a/biology/fasttree/files/Makefile b/biology/fasttree/files/Makefile new file mode 100644 index 00000000000..ada070cda53 --- /dev/null +++ b/biology/fasttree/files/Makefile @@ -0,0 +1,25 @@ + +BIN = FastTree +SRC = FastTree*.c +CC ?= gcc +CFLAGS ?= -O3 +CFLAGS += -DOPENMP -fopenmp -finline-functions -funroll-loops + +MKDIR ?= mkdir +INSTALL ?= install +PREFIX ?= /usr/local +DESTDIR ?= . + +.PHONY: all install clean + +all: ${BIN} + +${BIN}: ${SRC} Makefile + ${CC} ${CFLAGS} ${SRC} -o ${BIN} -lm + +install: ${BIN} + ${MKDIR} -p ${DESTDIR}${PREFIX}/bin + ${INSTALL} -s -c ${BIN} ${DESTDIR}${PREFIX}/bin + +clean: + ${RM} -f ${BIN} diff --git a/biology/fasttree/files/patch-FastTree-2.1.10.c b/biology/fasttree/files/patch-FastTree-2.1.10.c new file mode 100644 index 00000000000..36dd31ceb87 --- /dev/null +++ b/biology/fasttree/files/patch-FastTree-2.1.10.c @@ -0,0 +1,11 @@ +--- FastTree-2.1.10.c.orig 2017-12-04 15:09:11 UTC ++++ FastTree-2.1.10.c +@@ -8759,7 +8759,7 @@ double pnorm(double x) + + void *mymalloc(size_t sz) { + if (sz == 0) return(NULL); +- void *new = malloc(sz); ++ void *new = aligned_alloc(16, sz); + if (new == NULL) { + fprintf(stderr, "Out of memory\n"); + exit(1); diff --git a/biology/py-macs2/Makefile b/biology/py-macs2/Makefile index 5fd3fa1567a..82180b830d1 100644 --- a/biology/py-macs2/Makefile +++ b/biology/py-macs2/Makefile @@ -11,9 +11,9 @@ COMMENT= Analysis of chromatin immunoprecipitation (ChIP) sequences LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} +BUILD_DEPENDS= ${PYNUMPY} -USES= python +USES= python:2.7 USE_PYTHON= autoplist concurrent cython distutils USE_GITHUB= yes diff --git a/comms/mlan3/Makefile b/comms/mlan3/Makefile index aa20359e3a3..6a5662b68a0 100644 --- a/comms/mlan3/Makefile +++ b/comms/mlan3/Makefile @@ -19,6 +19,8 @@ NO_WRKSUBDIR= yes USES= dos2unix uidfix zip DOS2UNIX_GLOB= *.c *.h +CONFLICTS_INSTALL= shells/fish + post-patch: @${REINPLACE_CMD} -e '/int main/s/short argc/int argc/' \ ${WRKSRC}/apps/gethumd/gethumd.c ${WRKSRC}/apps/shaapp/shaapp.c diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile index 6bd6d088459..bc9f1b4a621 100644 --- a/databases/redis-devel/Makefile +++ b/databases/redis-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= redis -DISTVERSION= 4.0.2 +DISTVERSION= 4.0.6 CATEGORIES= databases MASTER_SITES= http://download.redis.io/releases/ PKGNAMESUFFIX= -devel diff --git a/databases/redis-devel/distinfo b/databases/redis-devel/distinfo index b777cc5661b..1230c503dda 100644 --- a/databases/redis-devel/distinfo +++ b/databases/redis-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1506183038 -SHA256 (redis-4.0.2.tar.gz) = b1a0915dbc91b979d06df1977fe594c3fa9b189f1f3d38743a2948c9f7634813 -SIZE (redis-4.0.2.tar.gz) = 1713990 +TIMESTAMP = 1512444121 +SHA256 (redis-4.0.6.tar.gz) = 769b5d69ec237c3e0481a262ff5306ce30db9b5c8ceb14d1023491ca7be5f6fa +SIZE (redis-4.0.6.tar.gz) = 1723533 diff --git a/deskutils/cycle/Makefile b/deskutils/cycle/Makefile index e09fc0ee9f1..f966c464ed8 100644 --- a/deskutils/cycle/Makefile +++ b/deskutils/cycle/Makefile @@ -12,7 +12,7 @@ COMMENT= Calendar program for women LICENSE= GPLv2+ -USES= python:run shebangfix tar:bzip2 +USES= python:2.7,run shebangfix tar:bzip2 SHEBANG_FILES= cycle.py USE_WX= 3.0+ WX_COMPS= python diff --git a/devel/boaconstructor/Makefile b/devel/boaconstructor/Makefile index 94ff079786e..c00ed98863e 100644 --- a/devel/boaconstructor/Makefile +++ b/devel/boaconstructor/Makefile @@ -14,7 +14,7 @@ COMMENT= Cross platform RAD GUI Building IDE for wxPython WRKSRC= ${WRKDIR}/boa-constructor-${PORTVERSION} -USES= dos2unix gettext python zip +USES= dos2unix gettext python:2.7 zip USE_WX= 3.0+ WX_COMPS= python DATADIR= ${PREFIX}/share/Boa diff --git a/devel/cvs-syncmail/Makefile b/devel/cvs-syncmail/Makefile index 90fc0e01966..dea757d7b84 100644 --- a/devel/cvs-syncmail/Makefile +++ b/devel/cvs-syncmail/Makefile @@ -6,24 +6,23 @@ PORTVERSION= 2.1 CATEGORIES= devel python MASTER_SITES= SF DISTNAME= syncmail -EXTRACT_SUFX= +EXTRACT_SUFX= # none MAINTAINER= ports@FreeBSD.org COMMENT= CVS notification tool +RUN_DEPENDS= cvs:devel/cvs + +LICENSE= BSD3CLAUSE # see CVS repository on SourceForge + USES= python shebangfix SHEBANG_FILES= ${DISTNAME} NO_BUILD= yes NO_WRKSUBDIR= yes +NO_ARCH= yes PLIST_FILES= bin/${DISTNAME} -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000000 -RUN_DEPENDS= cvs:devel/cvs -.endif - do-extract: @${MKDIR} ${WRKSRC} ${CP} ${DISTDIR}/${DISTNAME} ${WRKSRC} @@ -31,4 +30,4 @@ do-extract: do-install: ${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${STAGEDIR}${PREFIX}/bin/${DISTNAME} -.include +.include diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile index a60559cc4bb..3ee7d050132 100644 --- a/devel/doxygen/Makefile +++ b/devel/doxygen/Makefile @@ -16,7 +16,7 @@ COMMENT= Documentation system for C, C++, and other languages LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= bison cmake:outsource,noninja iconv python:2 shebangfix +USES= bison cmake:outsource,noninja iconv python shebangfix ALL_TARGET= all CMAKE_ARGS+= -DDOC_INSTALL_DIR:PATH=${DOCSDIR_REL} # Parallel jobs breaks when the DOCS option is on diff --git a/devel/libcfg/Makefile b/devel/libcfg/Makefile index e189506c6d3..0ffca0c379a 100644 --- a/devel/libcfg/Makefile +++ b/devel/libcfg/Makefile @@ -3,7 +3,7 @@ PORTNAME= libcfg PORTVERSION= 0.6.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MASTER_SITES= http://opensource.platon.org/projects/ DISTNAME= ${PORTNAME}+-${DISTVERSION} @@ -19,6 +19,7 @@ CONFLICTS_INSTALL= ossp-cfg USES= autoreconf gmake GNU_CONFIGURE= yes USE_LDCONFIG= yes +LLD_UNSAFE= yes INSTALL_TARGET= install-strip install-man diff --git a/devel/osc/distinfo b/devel/osc/distinfo index 8a793c13f4f..c81affdd628 100644 --- a/devel/osc/distinfo +++ b/devel/osc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1512130305 -SHA256 (openSUSE-osc-0.162.0_GH0.tar.gz) = 34b853e1e27c526fb5dccc45084524612c627fdd8e2c0342ec60ab391063aae9 -SIZE (openSUSE-osc-0.162.0_GH0.tar.gz) = 344040 +TIMESTAMP = 1512403187 +SHA256 (openSUSE-osc-0.162.0_GH0.tar.gz) = 9d47097ff6aff84a5f2b39ce4252fe2a8935cfdc67e570e76e941182a0cecccc +SIZE (openSUSE-osc-0.162.0_GH0.tar.gz) = 344014 diff --git a/devel/py-ocempgui/Makefile b/devel/py-ocempgui/Makefile index 73b41487ce3..08af20154ad 100644 --- a/devel/py-ocempgui/Makefile +++ b/devel/py-ocempgui/Makefile @@ -3,7 +3,7 @@ PORTNAME= ocempgui PORTVERSION= 0.2.9 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= devel python MASTER_SITES= SF/ocemp/${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,10 +15,10 @@ COMMENT= GUI toolkit in python LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${LOCALBASE}/include/${PYTHON_VERSION}/pygame/pygame.h:devel/py-game -RUN_DEPENDS= ${LOCALBASE}/include/${PYTHON_VERSION}/pygame/pygame.h:devel/py-game +BUILD_DEPENDS= ${PYGAME} +RUN_DEPENDS= ${PYGAME} -USES= python:2 +USES= python:2.7 USE_GNOME= atk USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/devel/shiboken/Makefile b/devel/shiboken/Makefile index 668ae4e02a5..8ef7269d722 100644 --- a/devel/shiboken/Makefile +++ b/devel/shiboken/Makefile @@ -22,7 +22,7 @@ PLIST_SUB= PORTVERSION=${PORTVERSION} \ USE_QT4= corelib qmake_build qtestlib moc_build network \ uic_build rcc_build xml xmlpatterns -USES= cmake python tar:bzip2 +USES= cmake python:2.7 tar:bzip2 USE_LDCONFIG= yes ALL_TARGET= all diff --git a/emulators/citra/Makefile b/emulators/citra/Makefile index 6b306ecf7d0..767101f1c1e 100644 --- a/emulators/citra/Makefile +++ b/emulators/citra/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20171129 +PORTVERSION= s20171204 PORTREVISION?= 0 CATEGORIES= emulators @@ -26,15 +26,15 @@ ONLY_FOR_ARCHS_REASON= https://github.com/MerryMage/dynarmic/issues/35 USE_GITHUB= yes GH_ACCOUNT= citra-emu -GH_TAGNAME= b2a99043 +GH_TAGNAME= 56db8e08 GH_TUPLE= citra-emu:ext-soundtouch:019d208:soundtouch/externals/soundtouch \ MerryMage:dynarmic:bb87d25:dynarmic/externals/dynarmic \ + benhoyt:inih:r40:inih/externals/inih/inih \ + catchorg:Catch2:v2.0.1:catch/externals/catch \ fmtlib:fmt:4.0.0:fmt/externals/fmt \ herumi:xbyak:v5.53-1-gc5da377:xbyak/externals/xbyak \ lsalzman:enet:a84c120:enet/externals/enet \ neobrain:nihstro:7e24743:nihstro/externals/nihstro \ - philsquared:Catch:v1.9.4:catch/externals/catch \ - svn2github:inih:603729d:inih/externals/inih/inih \ weidai11:cryptopp:CRYPTOPP_5_6_5-610-g24bc2b8:cryptopp/externals/cryptopp/cryptopp USES= cmake:outsource compiler:c++14-lang iconv localbase:ldflags @@ -58,7 +58,7 @@ SDL_PLIST_FILES=bin/${PORTNAME} \ man/man6/${PORTNAME}.6.gz QT5_USES= desktop-file-utils shared-mime-info -QT5_USE= QT5=qmake_build,buildtools_build,core,gui,opengl,widgets +QT5_USE= QT5=qmake_build,buildtools_build,concurrent_build,core,gui,opengl,widgets QT5_CMAKE_BOOL= ENABLE_QT QT5_PLIST_FILES=bin/${PORTNAME}-qt \ man/man6/${PORTNAME}-qt.6.gz \ diff --git a/emulators/citra/distinfo b/emulators/citra/distinfo index deda4eb90e4..8b06377ebf1 100644 --- a/emulators/citra/distinfo +++ b/emulators/citra/distinfo @@ -1,10 +1,14 @@ -TIMESTAMP = 1511970348 -SHA256 (citra-emu-citra-s20171129-b2a99043_GH0.tar.gz) = 3d49cbb7b06ebc9927b4006a105cdbd4601cec3c5b73d181b57ec543cac64d3a -SIZE (citra-emu-citra-s20171129-b2a99043_GH0.tar.gz) = 1635637 +TIMESTAMP = 1512421828 +SHA256 (citra-emu-citra-s20171204-56db8e08_GH0.tar.gz) = 4a03d4a5453ae51d7dce5c2b3af5e41839c82beb37ff1a49921d966a477914fc +SIZE (citra-emu-citra-s20171204-56db8e08_GH0.tar.gz) = 1641549 SHA256 (citra-emu-ext-soundtouch-019d208_GH0.tar.gz) = f48c211bbabe7ad79e1c504af1082756c74241be6bab4aca13140803f4b694e7 SIZE (citra-emu-ext-soundtouch-019d208_GH0.tar.gz) = 59366 SHA256 (MerryMage-dynarmic-bb87d25_GH0.tar.gz) = c9ac2c24b410526b94984d700081a77da8e28f5e5f553f18a1e2d99ff8fd54f8 SIZE (MerryMage-dynarmic-bb87d25_GH0.tar.gz) = 1246108 +SHA256 (benhoyt-inih-r40_GH0.tar.gz) = 0a7d8600c523ccd2d01a5bec2ef3a6482ada49794e67cf694d2bec796cb2c340 +SIZE (benhoyt-inih-r40_GH0.tar.gz) = 11436 +SHA256 (catchorg-Catch2-v2.0.1_GH0.tar.gz) = 5f31b93712e65d363f257ad0f0c02cfbed7a3988979d5f320ad7771e513d4cc8 +SIZE (catchorg-Catch2-v2.0.1_GH0.tar.gz) = 397154 SHA256 (fmtlib-fmt-4.0.0_GH0.tar.gz) = 35300a0d356529447a79ed5ccf419239d8b34f916e5d4625f046fd37afa3650a SIZE (fmtlib-fmt-4.0.0_GH0.tar.gz) = 617818 SHA256 (herumi-xbyak-v5.53-1-gc5da377_GH0.tar.gz) = 51129bc945fe2650f5fcd41f3b0166555b17589f03bda5d2216927234ef6446a @@ -13,10 +17,6 @@ SHA256 (lsalzman-enet-a84c120_GH0.tar.gz) = 409d458f2da9d8bba49191ab6abaeb6bcf89 SIZE (lsalzman-enet-a84c120_GH0.tar.gz) = 79369 SHA256 (neobrain-nihstro-7e24743_GH0.tar.gz) = 063728b01f7de99ca91693c46bd5c5a0fb03c0058baf4452d539f630b10f3650 SIZE (neobrain-nihstro-7e24743_GH0.tar.gz) = 110273 -SHA256 (philsquared-Catch-v1.9.4_GH0.tar.gz) = d67d2ee26ec9f72618dd9b28a9d1b7ba3c6368bc846ecfeda05a1e5d1b8b9b20 -SIZE (philsquared-Catch-v1.9.4_GH0.tar.gz) = 363097 -SHA256 (svn2github-inih-603729d_GH0.tar.gz) = b4faa364c3e33261707d4b669e1c669ca3818d7b9515c15fe0befd9df3f1f00a -SIZE (svn2github-inih-603729d_GH0.tar.gz) = 8342 SHA256 (weidai11-cryptopp-CRYPTOPP_5_6_5-610-g24bc2b8_GH0.tar.gz) = 9f3f59538ba0515307e142ab404d65270da709aa3ac906770ec658e47a277ec2 SIZE (weidai11-cryptopp-CRYPTOPP_5_6_5-610-g24bc2b8_GH0.tar.gz) = 7008104 SHA256 (whoshuu-cpr-1.3.0-12-gb5758fb_GH0.tar.gz) = 84ea509dc08766d7182b867b78ba6dd16f3352d85b18b0654661079b8617dae4 diff --git a/emulators/ppsspp/Makefile b/emulators/ppsspp/Makefile index 0c01a0f9ace..802dd74b9bb 100644 --- a/emulators/ppsspp/Makefile +++ b/emulators/ppsspp/Makefile @@ -2,7 +2,7 @@ PORTNAME= ppsspp DISTVERSIONPREFIX= v -DISTVERSION?= 1.5.2 +DISTVERSION?= 1.5.3 PORTREVISION?= 0 CATEGORIES= emulators # XXX Get from Debian once #697821 lands @@ -23,7 +23,7 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils USE_GITHUB= yes GH_ACCOUNT= hrydgard GH_TUPLE?= hrydgard:glslang:2edde666:glslang/ext/glslang \ - hrydgard:${PORTNAME}-lang:c37028e:lang/assets/lang \ + hrydgard:${PORTNAME}-lang:6f00429:lang/assets/lang \ KhronosGroup:SPIRV-Cross:90966d5:SPIRV/ext/SPIRV-Cross \ Kingcom:armips:v0.9-89-g8b4cada:armips/ext/armips \ Kingcom:tinyformat:Release-2.0.1-7-gb7f5a22:tinyformat/ext/armips/ext/tinyformat diff --git a/emulators/ppsspp/distinfo b/emulators/ppsspp/distinfo index 7d1af6d81c1..04badaf63dd 100644 --- a/emulators/ppsspp/distinfo +++ b/emulators/ppsspp/distinfo @@ -1,12 +1,12 @@ -TIMESTAMP = 1512030114 +TIMESTAMP = 1512213048 SHA256 (ppsspp.1) = 64a7cca4c3a5fc6ad5b63399edef9056b0c85ea68fed00fb7e97f4b2724e503b SIZE (ppsspp.1) = 1598 -SHA256 (hrydgard-ppsspp-v1.5.2_GH0.tar.gz) = 29e000f5f0176192ae412ef8dd2e5eefbba640a97ca502aeea6a91dc92142d38 -SIZE (hrydgard-ppsspp-v1.5.2_GH0.tar.gz) = 19005533 +SHA256 (hrydgard-ppsspp-v1.5.3_GH0.tar.gz) = 9f73078ab8ef32a1c0d65ca8979cb4717f08551f4c1e834faa4d5270faa38879 +SIZE (hrydgard-ppsspp-v1.5.3_GH0.tar.gz) = 19007098 SHA256 (hrydgard-glslang-2edde666_GH0.tar.gz) = 9ab09c2aa5a89b2c32297358d25850bec56667aa28fdfe6986fbedd1ced28e78 SIZE (hrydgard-glslang-2edde666_GH0.tar.gz) = 1941913 -SHA256 (hrydgard-ppsspp-lang-c37028e_GH0.tar.gz) = 768d2719dce1cec5ca25f8ff18d83fd4faa2cb89a8ff89f06f6253e5aebeb870 -SIZE (hrydgard-ppsspp-lang-c37028e_GH0.tar.gz) = 345639 +SHA256 (hrydgard-ppsspp-lang-6f00429_GH0.tar.gz) = a531b69ef2279b87c203a78e08c4499491ee3de7858938d95300bc172d103f55 +SIZE (hrydgard-ppsspp-lang-6f00429_GH0.tar.gz) = 346448 SHA256 (KhronosGroup-SPIRV-Cross-90966d5_GH0.tar.gz) = de8bcf01e0a0c4107871fdc8b764771487052fedbe2990a369e7908d4a95c000 SIZE (KhronosGroup-SPIRV-Cross-90966d5_GH0.tar.gz) = 228783 SHA256 (Kingcom-armips-v0.9-89-g8b4cada_GH0.tar.gz) = c41aa68bd6798356af568509de4f298485f752f620caae35ff84d17ff798b227 diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index 7d490a46713..1ef5cce9217 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.4-125 -DISTVERSIONSUFFIX= -g8f314c51 +DISTVERSION= 0.0.4-132 +DISTVERSIONSUFFIX= -g970d2a06 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo index 4cdd32eb4ee..186e1d1b1fb 100644 --- a/emulators/rpcs3/distinfo +++ b/emulators/rpcs3/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1512160086 -SHA256 (RPCS3-rpcs3-v0.0.4-125-g8f314c51_GH0.tar.gz) = 78e23025fc89567757ed01a01782fe8fa7324a1e48920744477d42fc8763b797 -SIZE (RPCS3-rpcs3-v0.0.4-125-g8f314c51_GH0.tar.gz) = 3598712 +TIMESTAMP = 1512400938 +SHA256 (RPCS3-rpcs3-v0.0.4-132-g970d2a06_GH0.tar.gz) = 8fa919484d7906d3790174e764e5c838707f2bb51e2af1e212c4da277eba48b1 +SIZE (RPCS3-rpcs3-v0.0.4-132-g970d2a06_GH0.tar.gz) = 3598702 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = e50e4f4e9035e891e16867e995f44aac87ce734a9dde169f02fc9719b2ce3642 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = 105623 SHA256 (RPCS3-yaml-cpp-release-0.5.3-62-g017626a_GH0.tar.gz) = 1d4b32443f137c23b68d3cb183ba6fb48eb76be2b0b30016970adff5c770d841 diff --git a/games/brainworkshop/Makefile b/games/brainworkshop/Makefile index d920cef86f3..dae4fca52a6 100644 --- a/games/brainworkshop/Makefile +++ b/games/brainworkshop/Makefile @@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Brain%20Workshop%20${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= Free open-source version of the Dual N-Back mental exercise -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyglet/__init__.py:graphics/py-pyglet +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyglet/__init__.py:graphics/py-pyglet@${PY_FLAVOR} USES= dos2unix python:2.7,run zip NO_BUILD= yes diff --git a/games/pysycache/Makefile b/games/pysycache/Makefile index 8a51b0843ba..13d21934edf 100644 --- a/games/pysycache/Makefile +++ b/games/pysycache/Makefile @@ -14,7 +14,7 @@ COMMENT= Educational software made in python LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pygame/__init__.py:devel/py-game +RUN_DEPENDS= ${PYGAME} USES= python:2.7 shebangfix zip NO_BUILD= yes diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile index 24b9d8a2b18..e1b6b8a4f86 100644 --- a/mail/maildrop/Makefile +++ b/mail/maildrop/Makefile @@ -16,7 +16,7 @@ # MAILDROP_MBOX_DIR= Specify DEFAULT mailbox location PORTNAME= maildrop -PORTVERSION= 2.9.2 +PORTVERSION= 2.9.3 CATEGORIES= mail MASTER_SITES= SF/courier/${PORTNAME}/${PORTVERSION} diff --git a/mail/maildrop/distinfo b/mail/maildrop/distinfo index ec517b001af..6b5caad5bc2 100644 --- a/mail/maildrop/distinfo +++ b/mail/maildrop/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1507210219 -SHA256 (maildrop-2.9.2.tar.bz2) = 599341e63b7e430cb719a1295f8d2a948ce9ed4fdcfe67e05203cf27727ce7c5 -SIZE (maildrop-2.9.2.tar.bz2) = 2078713 +TIMESTAMP = 1512335312 +SHA256 (maildrop-2.9.3.tar.bz2) = fceae3b85dd9caf4d769d76e5d1179c4065b7f3af88623008ad44f9e08299794 +SIZE (maildrop-2.9.3.tar.bz2) = 2079784 diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile index 47656ebd043..f6ac0015c7c 100644 --- a/mail/sympa/Makefile +++ b/mail/sympa/Makefile @@ -100,7 +100,7 @@ USE_RC_SUBR= sympa CONFLICTS= sympa-5* OPTIONS_DEFINE= FASTCGI APACHE NLS -OPTIONS_DEFAULT=APACHE +OPTIONS_DEFAULT=APACHE NLS OPTIONS_RADIO= DATABASE OPTIONS_RADIO_DATABASE= PGSQL SYBASE MYSQL OPTIONS_SUB= yes diff --git a/math/clarence/Makefile b/math/clarence/Makefile index d2ed6f16746..981c080c0ea 100644 --- a/math/clarence/Makefile +++ b/math/clarence/Makefile @@ -11,7 +11,7 @@ MASTER_SITES= http://www.sourcefiles.org/Productivity_Tools/Calculators/ \ MAINTAINER= psh@iki.fi COMMENT= Programmer's calculator -USES= python shebangfix +USES= python:2.7 shebangfix USE_GNOME= pygtk2 NO_BUILD= yes diff --git a/math/glpk/Makefile b/math/glpk/Makefile index 2f7406e67c2..481fe08a663 100644 --- a/math/glpk/Makefile +++ b/math/glpk/Makefile @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= glpk -DISTVERSION= 4.63 +DISTVERSION= 4.64 CATEGORIES= math MASTER_SITES= GNU -MAINTAINER= ports@FreeBSD.org +MAINTAINER= dg@syrec.org COMMENT= GNU Linear Programming Kit LICENSE= GPLv3+ diff --git a/math/glpk/distinfo b/math/glpk/distinfo index f0e7853d4cf..32819cab937 100644 --- a/math/glpk/distinfo +++ b/math/glpk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1511732948 -SHA256 (glpk-4.63.tar.gz) = 914d27f1a51c2bf4a51f1bd4a507f875fcca99db7b219380b836a25b29b3e7f6 -SIZE (glpk-4.63.tar.gz) = 4131787 +TIMESTAMP = 1512396158 +SHA256 (glpk-4.64.tar.gz) = 539267f40ea3e09c3b76a31c8747f559e8a097ec0cda8f1a3778eec3e4c3cc24 +SIZE (glpk-4.64.tar.gz) = 4143259 diff --git a/math/glpk/pkg-plist b/math/glpk/pkg-plist index a66b96d4912..ab3c3115a02 100644 --- a/math/glpk/pkg-plist +++ b/math/glpk/pkg-plist @@ -3,4 +3,4 @@ include/glpk.h lib/libglpk.a lib/libglpk.so lib/libglpk.so.40 -lib/libglpk.so.40.2.2 +lib/libglpk.so.40.2.3 diff --git a/multimedia/devede/Makefile b/multimedia/devede/Makefile index 3a2f962afed..8cc44cedd22 100644 --- a/multimedia/devede/Makefile +++ b/multimedia/devede/Makefile @@ -23,7 +23,7 @@ USE_GITHUB= yes GH_ACCOUNT= rastersoft GH_PROJECT= Devede -USES= iconv python:run shebangfix +USES= iconv python:2.7,run shebangfix USE_GNOME= pygtk2:run SHEBANG_FILES= devede NO_ARCH= yes diff --git a/net/tucan/Makefile b/net/tucan/Makefile index 592af9ab23e..98ab597cbd9 100644 --- a/net/tucan/Makefile +++ b/net/tucan/Makefile @@ -10,13 +10,13 @@ MASTER_SITES= http://forja.rediris.es/frs/download.php/2051/ MAINTAINER= gustau.perez@gmail.com COMMENT= Tucan Manager aids file-sharing with 1-click hosters -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${LOCALBASE}/bin/cntraining:graphics/tesseract NO_BUILD= yes USE_GNOME= pygtk2 librsvg2 -USES= gettext python +USES= gettext python:2.7 post-patch: ${REINPLACE_CMD} -Ee 's|#! /usr/bin/env python|#! ${PYTHON_CMD}|' ${WRKSRC}/tucan.py diff --git a/ports-mgmt/poudriere-devel/Makefile b/ports-mgmt/poudriere-devel/Makefile index fef54db12d0..b67a39f5007 100644 --- a/ports-mgmt/poudriere-devel/Makefile +++ b/ports-mgmt/poudriere-devel/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= poudriere -DISTVERSION= 3.2.99.20171129 -PORTREVISION= 0 +DISTVERSION= 3.2.99.20171204 +PORTREVISION= 1 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ @@ -18,7 +18,7 @@ CONFLICTS_INSTALL= poudriere-[0-9]* USE_GITHUB= yes GH_ACCOUNT= freebsd -GH_TAGNAME= 3.2.2-25-g8695dfd6 +GH_TAGNAME= 3.2.2-37-gf25a99c8 #DISTNAME= ${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME} GNU_CONFIGURE= yes diff --git a/ports-mgmt/poudriere-devel/distinfo b/ports-mgmt/poudriere-devel/distinfo index f2f42f4457d..4b3d57e5efd 100644 --- a/ports-mgmt/poudriere-devel/distinfo +++ b/ports-mgmt/poudriere-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1511988702 -SHA256 (freebsd-poudriere-3.2.99.20171129-3.2.2-25-g8695dfd6_GH0.tar.gz) = ab274a43b149ed101be4c8cf2b03d0e31773ee324fe841c17aef226f80fce8e2 -SIZE (freebsd-poudriere-3.2.99.20171129-3.2.2-25-g8695dfd6_GH0.tar.gz) = 4355244 +TIMESTAMP = 1512431516 +SHA256 (freebsd-poudriere-3.2.99.20171204-3.2.2-37-gf25a99c8_GH0.tar.gz) = d925d63c10c93ae6e061d4bd0ca5501e6289cf8dc17c048bdfee7e55e243db3e +SIZE (freebsd-poudriere-3.2.99.20171204-3.2.2-37-gf25a99c8_GH0.tar.gz) = 4355800 diff --git a/security/dsniff/Makefile b/security/dsniff/Makefile index ee32ebef626..20295a892e3 100644 --- a/security/dsniff/Makefile +++ b/security/dsniff/Makefile @@ -18,6 +18,7 @@ LIB_DEPENDS= libnet.so:net/libnet BUILD_DEPENDS= ${LOCALBASE}/lib/libnids.a:net/libnids BROKEN_FreeBSD_12= fails to compile: pcaputil.c: '/usr/include/pcap-int.h' file not found +BROKEN_FreeBSD_11= fails to compile: pcaputil.c: '/usr/include/pcap-int.h' file not found USE_HARDENING= pie:off diff --git a/security/spike-proxy/Makefile b/security/spike-proxy/Makefile index c7a83ce184c..fdfac89f3ff 100644 --- a/security/spike-proxy/Makefile +++ b/security/spike-proxy/Makefile @@ -3,6 +3,7 @@ PORTNAME= spike-proxy PORTVERSION= 1.4.8 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://www.immunitysec.com/downloads/ DISTNAME= SP${PORTVERSION:tl:C/\.//g} @@ -13,9 +14,9 @@ COMMENT= Tool looking for vulnerabilities in web applications LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR} -USES= python shebangfix tar:tgz +USES= python:2.7 shebangfix tar:tgz SHEBANG_FILES= *.py NO_BUILD= yes NO_ARCH= yes diff --git a/shells/fish/Makefile b/shells/fish/Makefile index 04657c0636c..2ae2c784b5a 100644 --- a/shells/fish/Makefile +++ b/shells/fish/Makefile @@ -17,6 +17,8 @@ USES= autoreconf cpe gmake libtool ncurses pkgconfig pathfix python:3.4+ \ localbase compiler:c++11-lang shebangfix SHEBANG_FILES= share/tools/*.py share/tools/web_config/webconfig.py +CONFLICTS_INSTALL= comms/mlan3 + GNU_CONFIGURE= yes CPE_VENDOR= fishshell diff --git a/www/mod_pagespeed/Makefile b/www/mod_pagespeed/Makefile index 6b2b63d99d5..811687dc9e7 100644 --- a/www/mod_pagespeed/Makefile +++ b/www/mod_pagespeed/Makefile @@ -2,7 +2,7 @@ PORTNAME= mod_pagespeed PORTVERSION= 1.12.34.2 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= www devel MASTER_SITES= LOCAL/mmokhi:boringssl,chromium_base,chromium_build,googleurl,gflags_arch,gflags_src,libjpeg_turbo_src,yasm_patched,libwebp,modpb64 \ @@ -14,9 +14,6 @@ COMMENT= Apache module for rewriting web pages to reduce latency LICENSE= APACHE20 -BROKEN_SSL= base -BROKEN_SSL_REASON_base= needs openssl.pc - BUILD_DEPENDS= bash:shells/bash \ curl:ftp/curl \ closure-compiler:www/closure-compiler \ @@ -34,7 +31,7 @@ LIB_DEPENDS= libpng.so:graphics/png \ libicutu.so:devel/icu \ libopencv_legacy.so:graphics/opencv -USES= compiler:c++14-lang jpeg gmake localbase pkgconfig \ +USES= compiler:c++14-lang gperf jpeg gmake localbase pkgconfig \ python shebangfix ssl tar:xz USE_APACHE= 22 SHEBANG_GLOB= *.gyp *.gypi *.py *.sh @@ -145,7 +142,7 @@ post-patch: cd ${BUILD_WRKSRC}/third_party/google-sparsehash/gen/arch/freebsd && \ ${MV} ia32 i386 && ${MV} x64 amd64 ) ${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" \ - ${WRKSRC}/base/base.gypi + ${WRKSRC}/base/base.gypi ${WRKSRC}/third_party/serf/select_openssl.gyp ${REINPLACE_CMD} -e "s,%%PORTSSTAGE%%,${STAGEDIR},g" \ ${WRKSRC}/install/Makefile ${FIND} ${WRKSRC} -type f \( -name "*.gyp" -o -name "*.gypi" \) -exec \ diff --git a/www/mod_pagespeed/files/patch-third__party_grpc_src_src_core_lib_tsi_ssl__transport__security.c b/www/mod_pagespeed/files/patch-third__party_grpc_src_src_core_lib_tsi_ssl__transport__security.c index 165a37b827a..31e1b5aa1f4 100644 --- a/www/mod_pagespeed/files/patch-third__party_grpc_src_src_core_lib_tsi_ssl__transport__security.c +++ b/www/mod_pagespeed/files/patch-third__party_grpc_src_src_core_lib_tsi_ssl__transport__security.c @@ -8,3 +8,18 @@ #include #include +@@ -54,11 +55,10 @@ + #define TSI_SSL_MAX_PROTECTED_FRAME_SIZE_UPPER_BOUND 16384 + #define TSI_SSL_MAX_PROTECTED_FRAME_SIZE_LOWER_BOUND 1024 + +-/* Putting a macro like this and littering the source file with #if is really +- bad practice. +- TODO(jboeuf): refactor all the #if / #endif in a separate module. */ +-#ifndef TSI_OPENSSL_ALPN_SUPPORT ++#if OPENSSL_VERSION_NUMBER >= 0x10002000L + #define TSI_OPENSSL_ALPN_SUPPORT 1 ++#else ++#define TSI_OPENSSL_ALPN_SUPPORT 0 + #endif + + /* TODO(jboeuf): I have not found a way to get this number dynamically from the diff --git a/www/mod_pagespeed/files/patch-third__party_serf_instaweb__ssl__buckets.c b/www/mod_pagespeed/files/patch-third__party_serf_instaweb__ssl__buckets.c new file mode 100644 index 00000000000..91b7882a13c --- /dev/null +++ b/www/mod_pagespeed/files/patch-third__party_serf_instaweb__ssl__buckets.c @@ -0,0 +1,18 @@ +--- third_party/serf/instaweb_ssl_buckets.c.orig 2017-06-08 22:22:39 UTC ++++ third_party/serf/instaweb_ssl_buckets.c +@@ -1697,11 +1697,15 @@ int serf_ssl_cert_depth(const serf_ssl_c + int serf_ssl_check_host(const serf_ssl_certificate_t *cert, + const char* hostname) + { ++#if TSI_OPENSSL_ALPN_SUPPORT == 0 ++ return (-1); ++#else + return X509_check_host(cert->ssl_cert, + hostname, + strlen(hostname), + 0 /* we don't need to set any flags */, + NULL /* we don't need the SAN or CN extracted*/); ++#endif + } + + apr_hash_t *serf_ssl_cert_issuer( diff --git a/www/mod_pagespeed/files/patch-third__party_serf_select__openssl.gyp b/www/mod_pagespeed/files/patch-third__party_serf_select__openssl.gyp index 568609ea818..d122c8ae104 100644 --- a/www/mod_pagespeed/files/patch-third__party_serf_select__openssl.gyp +++ b/www/mod_pagespeed/files/patch-third__party_serf_select__openssl.gyp @@ -1,15 +1,21 @@ ---- third_party/serf/select_openssl.gyp.orig 2017-10-04 20:20:10 UTC +--- third_party/serf/select_openssl.gyp.orig 2017-06-08 22:22:39 UTC +++ third_party/serf/select_openssl.gyp -@@ -47,10 +47,10 @@ +@@ -42,15 +42,15 @@ + 'type': 'none', + 'direct_dependent_settings': { + 'cflags': [ +- 'depth; + } + +@@ -337,11 +337,15 @@ + +int serf_ssl_check_host(const serf_ssl_certificate_t *cert, + + const char* hostname) + +{ +++#if TSI_OPENSSL_ALPN_SUPPORT == 0 +++ return (-1); +++#else + + return X509_check_host(cert->ssl_cert, + + hostname, + + strlen(hostname), + + 0 /* we don't need to set any flags */, + + NULL /* we don't need the SAN or CN extracted*/); +++#endif + +} + + apr_hash_t *serf_ssl_cert_issuer( diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 21bd89ebd5a..59b409ab967 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.13.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ MASTER_SITES+= LOCAL/osa @@ -15,6 +15,10 @@ COMMENT?= Robust and small WWW server LICENSE= BSD2CLAUSE +CONFLICTS_INSTALL= nginx + +PORTSCOUT= limit:^1\.13\.[0-9]* + USES+= cpe CPE_VENDOR= nginx @@ -123,6 +127,7 @@ OPTIONS_DEFINE= \ SMALL_LIGHT \ SRCACHE \ VOD \ + VTS \ X11 \ XSS @@ -233,6 +238,7 @@ SLOWFS_CACHE_DESC= 3rd party slowfs_cache module SMALL_LIGHT_DESC= 3rd party small_light module SRCACHE_DESC= 3rd party srcache module VOD_DESC= 3rd party vod module +VTS_DESC= 3rd party vts module X11_DESC= graphics/ImageMagick[-nox11] dependency XSS_DESC= 3rd party xss module VIDEO_DESC= Video module support @@ -453,7 +459,7 @@ IGNORE= CT option requires OpenSSL 1.0.2, add DEFAULT_VERSIONS+=ssl=openssl to .endif .if ${PORT_OPTIONS:MECHO} -NGINX_ECHO_VERSION= 46334b3 +NGINX_ECHO_VERSION= d95da35 GH_ACCOUNT+= openresty:echo GH_PROJECT+= echo-nginx-module:echo GH_TAGNAME+= ${NGINX_ECHO_VERSION}:echo @@ -462,7 +468,6 @@ CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_echo} .else CONFIGURE_ARGS+=--add-module=${WRKSRC_echo} .endif -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_echo_request_info.c .endif .if ${PORT_OPTIONS:MFASTDFS} @@ -631,7 +636,7 @@ USES+= perl5 .endif .if ${PORT_OPTIONS:MHTTP_PUSH} -GIT_PUSH_VERSION= 0.99.16 +GIT_PUSH_VERSION= 1.1.13 GH_ACCOUNT+= slact:push GH_PROJECT+= nchan:push GH_TAGNAME+= v${GIT_PUSH_VERSION}:push @@ -685,7 +690,7 @@ LIB_DEPENDS+= libmsgpuck.so:devel/msgpuck \ libyajl.so:devel/yajl GH_ACCOUNT+= tarantool:nginx_tarantool GH_PROJECT+= nginx_upstream_module:nginx_tarantool -GH_TAGNAME+= 1278ee5:nginx_tarantool +GH_TAGNAME+= 4ca8684:nginx_tarantool .if ${PORT_OPTIONS:MDSO} CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_nginx_tarantool} .else @@ -853,7 +858,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_let} LIB_DEPENDS+= libluajit-5.1.so:lang/luajit CONFIGURE_ENV+= "LUAJIT_INC=${LOCALBASE}/include/luajit-2.0" CONFIGURE_ENV+= "LUAJIT_LIB=${LOCALBASE}/lib" -NGINX_LUA_VERSION= 0.10.8 +NGINX_LUA_VERSION= 0.10.11 GH_ACCOUNT+= openresty:lua GH_PROJECT+= lua-nginx-module:lua GH_TAGNAME+= v${NGINX_LUA_VERSION}:lua @@ -862,11 +867,6 @@ CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_lua} .else CONFIGURE_ARGS+=--add-module=${WRKSRC_lua} .endif -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_lua_common.h \ - ${PATCHDIR}/extra-patch-ngx_http_lua_headers.c \ - ${PATCHDIR}/extra-patch-ngx_http_lua_headers.h \ - ${PATCHDIR}/extra-patch-ngx_http_lua_module.c \ - ${PATCHDIR}/extra-patch-ngx_http_lua_ssl_ocsp.c .endif .if ${PORT_OPTIONS:MMEMC} @@ -959,12 +959,11 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_rdsjson} .endif .if ${PORT_OPTIONS:MREDIS2} -NGINX_REDIS2_VERSION= 0.12 +NGINX_REDIS2_VERSION= 0.14 GH_ACCOUNT+= openresty:redis2 GH_PROJECT+= redis2-nginx-module:redis2 GH_TAGNAME+= v${NGINX_REDIS2_VERSION}:redis2 CONFIGURE_ARGS+=--add-module=${WRKSRC_redis2} -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_redis2_util.c .endif .if ${PORT_OPTIONS:MRTMP} @@ -1027,7 +1026,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_small_light} .endif .if ${PORT_OPTIONS:MSRCACHE} -NGINX_SRCACHE_VERSION= 0.30 +NGINX_SRCACHE_VERSION= 0.31 GH_ACCOUNT+= openresty:srcache GH_PROJECT+= srcache-nginx-module:srcache GH_TAGNAME+= v${NGINX_SRCACHE_VERSION}:srcache @@ -1035,7 +1034,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_srcache} .endif .if ${PORT_OPTIONS:MVOD} -NGINX_VOD_VERSION= 1.18 +NGINX_VOD_VERSION= 1.22 GH_ACCOUNT+= kaltura:vod GH_PROJECT+= nginx-vod-module:vod GH_TAGNAME+= ${NGINX_VOD_VERSION}:vod @@ -1046,6 +1045,14 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_vod} .endif .endif +.if ${PORT_OPTIONS:MVTS} +NGINX_VTS_VERSION= 0.1.15 +GH_ACCOUNT+= vozlt:vts +GH_PROJECT+= nginx-module-vts:vts +GH_TAGNAME+= v${NGINX_VTS_VERSION}:vts +CONFIGURE_ARGS+=--add-module=${WRKSRC_vts} +.endif + .if ${PORT_OPTIONS:MXSS} NGINX_XSS_VERSION= 0.05 GH_ACCOUNT+= openresty:xss @@ -1063,7 +1070,7 @@ CONFIGURE_ARGS+=--with-http_v2_module .if ${PORT_OPTIONS:MNJS} GH_ACCOUNT+= nginx:njs GH_PROJECT+= njs:njs -GH_TAGNAME+= bd40aea:njs +GH_TAGNAME+= 4ed8a0b:njs .if ${PORT_OPTIONS:MDSO} CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_njs}/nginx .else @@ -1137,9 +1144,9 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_arrayvar} .endif .if ${PORT_OPTIONS:MBROTLI} -NGINX_BROTLI_VERSION= 12529813 +NGINX_BROTLI_VERSION= 14dede1 LIB_DEPENDS+= libbrotlicommon.so:archivers/brotli -GH_ACCOUNT+= google:brotli +GH_ACCOUNT+= eustas:brotli GH_PROJECT+= ngx_brotli:brotli GH_TAGNAME+= ${NGINX_BROTLI_VERSION}:brotli .if ${PORT_OPTIONS:MDSO} @@ -1263,6 +1270,11 @@ post-patch: 's!%%PREFIX%%!${LOCALBASE}!g' \ ${WRKSRC_nginx_tarantool}/config .endif +.if ${PORT_OPTIONS:MBROTLI} + @${REINPLACE_CMD} \ + '62s|\/usr\/local|${LOCALBASE}|' \ + ${WRKSRC_brotli}/config +.endif pre-configure: .if ${PORT_OPTIONS:MMODSECURITY} diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index cbe0582d13c..f101878d52a 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1511734956 +TIMESTAMP = 1512445126 SHA256 (nginx-1.13.7.tar.gz) = beb732bc7da80948c43fd0bf94940a21a21b1c1ddfba0bd99a4b88e026220f5c SIZE (nginx-1.13.7.tar.gz) = 990836 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c @@ -37,8 +37,8 @@ SHA256 (nginx-clojure-nginx-clojure-v0.4.5_GH0.tar.gz) = c6d500f935dde5f87a6eb47 SIZE (nginx-clojure-nginx-clojure-v0.4.5_GH0.tar.gz) = 602064 SHA256 (grahamedgecombe-nginx-ct-v1.3.2_GH0.tar.gz) = b4ceae549b9dbf84b2e511633982e4efeee0388e3b7a038a8bac555008a77b88 SIZE (grahamedgecombe-nginx-ct-v1.3.2_GH0.tar.gz) = 6844 -SHA256 (openresty-echo-nginx-module-46334b3_GH0.tar.gz) = 00d42a5f562a0be5570110d9b70c8f2cace93b292421a6f994cf4ec76a8979f0 -SIZE (openresty-echo-nginx-module-46334b3_GH0.tar.gz) = 52766 +SHA256 (openresty-echo-nginx-module-d95da35_GH0.tar.gz) = d1cd947c9ab3174857781e7e8a481125e3f05596be76a6114ba4a6e19ee5e902 +SIZE (openresty-echo-nginx-module-d95da35_GH0.tar.gz) = 53162 SHA256 (happyfish100-fastdfs-nginx-module-5a8110f_GH0.tar.gz) = 58daa08a5ab9b9de5459817fc088230f4092fb818b87a2cb61b217952a5af54d SIZE (happyfish100-fastdfs-nginx-module-5a8110f_GH0.tar.gz) = 17980 SHA256 (openresty-headers-more-nginx-module-84241e4_GH0.tar.gz) = d3442be9058682ed0ad1d294ab27effcb245c0a320fcf418c452dc923f714531 @@ -57,14 +57,14 @@ SHA256 (nginx-modules-ngx_http_json_status_module-1d2f303_GH0.tar.gz) = fdc34e0e SIZE (nginx-modules-ngx_http_json_status_module-1d2f303_GH0.tar.gz) = 6736 SHA256 (kr-nginx-notice-3c95966_GH0.tar.gz) = e829fc94178cc8c91fef15a1fc44ee7ac162c13eddc0bba4c9427aaa23386885 SIZE (kr-nginx-notice-3c95966_GH0.tar.gz) = 3343 -SHA256 (slact-nchan-v0.99.16_GH0.tar.gz) = 200cc1b02931a067c3edb07243a7faac80265ce6aab37af680cf7373011efc41 -SIZE (slact-nchan-v0.99.16_GH0.tar.gz) = 378626 +SHA256 (slact-nchan-v1.1.13_GH0.tar.gz) = 8e869ea92fd885f5d9755f926e809ee81ca21967044b98e9932a8eb661d91709 +SIZE (slact-nchan-v1.1.13_GH0.tar.gz) = 629850 SHA256 (wandenberg-nginx-push-stream-module-0.5.1_GH0.tar.gz) = a95f31e80120fd7324795b92a0d94c0b43e1265df7fd0f1eba11a337c1e0a626 SIZE (wandenberg-nginx-push-stream-module-0.5.1_GH0.tar.gz) = 175263 SHA256 (yaoweibin-ngx_http_substitutions_filter_module-v0.6.4_GH0.tar.gz) = ed4ddbcf0c434f4a1e97b61251a63ace759792764bd5cb79ff20efe348db8db3 SIZE (yaoweibin-ngx_http_substitutions_filter_module-v0.6.4_GH0.tar.gz) = 92230 -SHA256 (tarantool-nginx_upstream_module-1278ee5_GH0.tar.gz) = 34d51afcd464582e6011a5d3abe6829c5690ddb9b50c993dfdafb4c725a4803a -SIZE (tarantool-nginx_upstream_module-1278ee5_GH0.tar.gz) = 48378 +SHA256 (tarantool-nginx_upstream_module-4ca8684_GH0.tar.gz) = e1ce39052f2df4972dc7ce827a3ff774660586955c5894cf38997c6f687d8fa4 +SIZE (tarantool-nginx_upstream_module-4ca8684_GH0.tar.gz) = 59005 SHA256 (Austinb-nginx-upload-module-72ec037_GH0.tar.gz) = c6d4e38ad0712c898cc53721f492f8f73acf2753cc0a0769fa34d4d6ba4e8efd SIZE (Austinb-nginx-upload-module-72ec037_GH0.tar.gz) = 28303 SHA256 (masterzen-nginx-upload-progress-module-v0.9.0_GH0.tar.gz) = 93e29b9b437a2e34713de54c2861ea51151624aca09f73f9f44d1caaff01a6b1 @@ -91,8 +91,8 @@ SHA256 (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 552c54aff81c4701ace4eb1ce20c SIZE (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 53024 SHA256 (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = cbf6fcddc00a7e30289134bdeace12565e000cc7d4efee2d2ebb8799d0b88270 SIZE (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = 20534 -SHA256 (openresty-lua-nginx-module-v0.10.8_GH0.tar.gz) = d67449c71051b3cc2d6dd60df0ae0d21fca08aa19c9b30c5b95ee21ff38ef8dd -SIZE (openresty-lua-nginx-module-v0.10.8_GH0.tar.gz) = 606643 +SHA256 (openresty-lua-nginx-module-v0.10.11_GH0.tar.gz) = c0fb91fcfd1c6e7dec34ca64826ef81ffebafdef6174d254467636f380566626 +SIZE (openresty-lua-nginx-module-v0.10.11_GH0.tar.gz) = 616653 SHA256 (openresty-memc-nginx-module-v0.18_GH0.tar.gz) = 4e280d1dcb8b312bc7875604c1e35b17879279126d3d5fbf482aa9cc7c11276d SIZE (openresty-memc-nginx-module-v0.18_GH0.tar.gz) = 37113 SHA256 (nbs-system-naxsi-0.54_GH0.tar.gz) = 9cc2c09405bc71f78ef26a8b6d70afcea3fccbe8125df70cb0cfc480133daba5 @@ -103,8 +103,8 @@ SHA256 (openresty-rds-csv-nginx-module-v0.07_GH0.tar.gz) = b204909c6fb194fe8fed7 SIZE (openresty-rds-csv-nginx-module-v0.07_GH0.tar.gz) = 19444 SHA256 (openresty-rds-json-nginx-module-v0.14_GH0.tar.gz) = 99aedf222a9664484918392988cce41b1a6238240d42f8bd44f5ff102c05c36c SIZE (openresty-rds-json-nginx-module-v0.14_GH0.tar.gz) = 33496 -SHA256 (openresty-redis2-nginx-module-v0.12_GH0.tar.gz) = baf5274c815a5f27854747df09ff5bcd6d82e0baa2f224a9db6450d2f3a35a4f -SIZE (openresty-redis2-nginx-module-v0.12_GH0.tar.gz) = 28981 +SHA256 (openresty-redis2-nginx-module-v0.14_GH0.tar.gz) = d830e072fcb4acee8490ba3e38eee6034fd884a954d17ad4efeb397032c58a71 +SIZE (openresty-redis2-nginx-module-v0.14_GH0.tar.gz) = 27924 SHA256 (arut-nginx-rtmp-module-v1.1.8_GH0.tar.gz) = de5866111a5b18c9dfb1c10f3a0e84b56af77f7005a41807368f7769b8a50965 SIZE (arut-nginx-rtmp-module-v1.1.8_GH0.tar.gz) = 519647 SHA256 (openresty-set-misc-nginx-module-f808ef4_GH0.tar.gz) = 5f32c484b29b9047dfa65fd3eec511c0f7c65f0f3ec0a4e0453359cf4642d405 @@ -115,18 +115,20 @@ SHA256 (nginx-shib-nginx-http-shibboleth-4f1119b_GH0.tar.gz) = c25f284bc934f59a2 SIZE (nginx-shib-nginx-http-shibboleth-4f1119b_GH0.tar.gz) = 16688 SHA256 (cubicdaiya-ngx_small_light-v0.8.0_GH0.tar.gz) = 8f513d6d3df32c3b05327d40e16efd020532a911d3eeca8015eb6271f2d4fd1c SIZE (cubicdaiya-ngx_small_light-v0.8.0_GH0.tar.gz) = 55918 -SHA256 (openresty-srcache-nginx-module-v0.30_GH0.tar.gz) = e34b1ab5f5007661f73819f9c20fd6c2a46ed3e53364e9449b02ef2bd3628633 -SIZE (openresty-srcache-nginx-module-v0.30_GH0.tar.gz) = 58777 -SHA256 (kaltura-nginx-vod-module-1.18_GH0.tar.gz) = cba0673725f66279671d9dc0ac7bea6ea78cf963ce1b6582320d10a857a818d3 -SIZE (kaltura-nginx-vod-module-1.18_GH0.tar.gz) = 388548 +SHA256 (openresty-srcache-nginx-module-v0.31_GH0.tar.gz) = 3f9729e73a8340926fa9d9fc15707c2f287cd27b6a9fe42e83f660ca48a5972d +SIZE (openresty-srcache-nginx-module-v0.31_GH0.tar.gz) = 48310 +SHA256 (kaltura-nginx-vod-module-1.22_GH0.tar.gz) = 79214a1c2f9b133e039ae78d6a09635ad2bec183c77e2a32bf03003841b3c35b +SIZE (kaltura-nginx-vod-module-1.22_GH0.tar.gz) = 438203 +SHA256 (vozlt-nginx-module-vts-v0.1.15_GH0.tar.gz) = 5112a054b1b1edb4c0042a9a840ef45f22abb3c05c68174e28ebf483164fb7e1 +SIZE (vozlt-nginx-module-vts-v0.1.15_GH0.tar.gz) = 371128 SHA256 (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 958bd8de773601d8d3138501cc4be0420f1c818a3987a70cc9c0023371e432cf SIZE (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 11477 -SHA256 (nginx-njs-bd40aea_GH0.tar.gz) = 0fea9022d79db2b74d2da1b44f6366a3c60fe47475b77a80c506ef02ad976151 -SIZE (nginx-njs-bd40aea_GH0.tar.gz) = 203897 +SHA256 (nginx-njs-4ed8a0b_GH0.tar.gz) = 44cd86b48bf6a65e6faf76b59cbf75b6317d62d33081671d192632baaf43f165 +SIZE (nginx-njs-4ed8a0b_GH0.tar.gz) = 229162 SHA256 (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = c949d4be6f3442c8e2937046448dc8d8def25c0e0fa6f4e805144cea45eabe80 SIZE (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = 11280 -SHA256 (google-ngx_brotli-12529813_GH0.tar.gz) = 788b25c4a3285b34d06e48a469fd0d0cb52d43b43edccd2935e22802dcfd2d69 -SIZE (google-ngx_brotli-12529813_GH0.tar.gz) = 10448 +SHA256 (eustas-ngx_brotli-14dede1_GH0.tar.gz) = 655e47be5d947b105b7fd53303c5a94b78e9c8ed9cd96fc786cedc7445fbf539 +SIZE (eustas-ngx_brotli-14dede1_GH0.tar.gz) = 10583 SHA256 (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 5c1869d55897075adb3fdf840b21060dc54669a1f840a36d1539acc7e59dd106 SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090 SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462 diff --git a/www/nginx-devel/files/extra-patch-ngx_http_echo_request_info.c b/www/nginx-devel/files/extra-patch-ngx_http_echo_request_info.c deleted file mode 100644 index 87b39d08a5d..00000000000 --- a/www/nginx-devel/files/extra-patch-ngx_http_echo_request_info.c +++ /dev/null @@ -1,43 +0,0 @@ ---- ../echo-nginx-module-46334b3/src/ngx_http_echo_request_info.c.orig 2017-04-15 10:03:29.616243000 -0400 -+++ ../echo-nginx-module-46334b3/src/ngx_http_echo_request_info.c 2017-04-15 10:07:41.329695000 -0400 -@@ -179,6 +179,9 @@ - ngx_int_t i, j; - ngx_buf_t *b, *first = NULL; - unsigned found; -+#if defined(nginx_version) && nginx_version >= 1011011 -+ ngx_chain_t *cl; -+#endif - ngx_connection_t *c; - ngx_http_request_t *mr; - ngx_http_connection_t *hc; -@@ -215,8 +218,15 @@ - - if (hc->nbusy) { - b = NULL; -+ -+#if defined(nginx_version) && nginx_version >= 1011011 -+ for (cl = hc->busy; cl; /* void */) { -+ b = cl->buf; -+ cl = cl->next; -+#else - for (i = 0; i < hc->nbusy; i++) { - b = hc->busy[i]; -+#endif - - if (first == NULL) { - if (mr->request_line.data >= b->pos -@@ -280,8 +290,14 @@ - } - - if (hc->nbusy) { -+#if defined(nginx_version) && nginx_version >= 1011011 -+ for (cl = hc->busy; cl; /* void */) { -+ b = cl->buf; -+ cl = cl->next; -+#else - for (i = 0; i < hc->nbusy; i++) { - b = hc->busy[i]; -+#endif - - if (!found) { - if (b != first) { diff --git a/www/nginx-devel/files/extra-patch-ngx_http_lua_common.h b/www/nginx-devel/files/extra-patch-ngx_http_lua_common.h deleted file mode 100644 index 24d7960c2bb..00000000000 --- a/www/nginx-devel/files/extra-patch-ngx_http_lua_common.h +++ /dev/null @@ -1,15 +0,0 @@ ---- ../lua-nginx-module-0.10.8/src/ngx_http_lua_common.h.orig 2017-04-15 10:55:20.591680000 -0400 -+++ ../lua-nginx-module-0.10.8/src/ngx_http_lua_common.h 2017-04-15 10:55:50.449108000 -0400 -@@ -199,6 +199,12 @@ - of reqeusts */ - ngx_uint_t malloc_trim_req_count; - -+#if nginx_version >= 1011011 -+ /* the following 2 fields are only used by ngx.req.raw_headers() for now */ -+ ngx_buf_t **busy_buf_ptrs; -+ ngx_int_t busy_buf_ptr_count; -+#endif -+ - unsigned requires_header_filter:1; - unsigned requires_body_filter:1; - unsigned requires_capture_filter:1; diff --git a/www/nginx-devel/files/extra-patch-ngx_http_lua_headers.c b/www/nginx-devel/files/extra-patch-ngx_http_lua_headers.c deleted file mode 100644 index d21a6c159db..00000000000 --- a/www/nginx-devel/files/extra-patch-ngx_http_lua_headers.c +++ /dev/null @@ -1,124 +0,0 @@ ---- ../lua-nginx-module-0.10.8/src/ngx_http_lua_headers.c.orig 2017-04-15 10:57:48.875770000 -0400 -+++ ../lua-nginx-module-0.10.8/src/ngx_http_lua_headers.c 2017-04-15 11:02:00.492564000 -0400 -@@ -26,6 +26,9 @@ - static int ngx_http_lua_ngx_req_header_clear(lua_State *L); - static int ngx_http_lua_ngx_req_header_set(lua_State *L); - static int ngx_http_lua_ngx_resp_get_headers(lua_State *L); -+#if nginx_version >= 1011011 -+void ngx_http_lua_ngx_raw_header_cleanup(void *data); -+#endif - - - static int -@@ -77,6 +80,11 @@ - size_t size; - ngx_buf_t *b, *first = NULL; - ngx_int_t i, j; -+#if nginx_version >= 1011011 -+ ngx_buf_t **bb; -+ ngx_chain_t *cl; -+ ngx_http_lua_main_conf_t *lmcf; -+#endif - ngx_connection_t *c; - ngx_http_request_t *r, *mr; - ngx_http_connection_t *hc; -@@ -93,6 +101,10 @@ - return luaL_error(L, "no request object found"); - } - -+#if nginx_version >= 1011011 -+ lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module); -+#endif -+ - ngx_http_lua_check_fake_request(L, r); - - mr = r->main; -@@ -109,8 +121,13 @@ - dd("hc->nbusy: %d", (int) hc->nbusy); - - if (hc->nbusy) { -+#if nginx_version >= 1011011 -+ dd("hc->busy: %p %p %p %p", hc->busy->buf->start, hc->busy->buf->pos, -+ hc->busy->buf->last, hc->busy->buf->end); -+#else - dd("hc->busy: %p %p %p %p", hc->busy[0]->start, hc->busy[0]->pos, - hc->busy[0]->last, hc->busy[0]->end); -+#endif - } - - dd("request line: %p %p", mr->request_line.data, -@@ -146,9 +163,37 @@ - dd("size: %d", (int) size); - - if (hc->nbusy) { -+#if nginx_version >= 1011011 -+ if (hc->nbusy > lmcf->busy_buf_ptr_count) { -+ if (lmcf->busy_buf_ptrs) { -+ ngx_free(lmcf->busy_buf_ptrs); -+ } -+ -+ lmcf->busy_buf_ptrs = ngx_alloc(hc->nbusy * sizeof(ngx_buf_t *), -+ r->connection->log); -+ -+ if (lmcf->busy_buf_ptrs == NULL) { -+ return luaL_error(L, "no memory"); -+ } -+ -+ lmcf->busy_buf_ptr_count = hc->nbusy; -+ } -+ -+ bb = lmcf->busy_buf_ptrs; -+ for (cl = hc->busy; cl; cl = cl->next) { -+ *bb++ = cl->buf; -+ } -+#endif - b = NULL; -+ -+#if nginx_version >= 1011011 -+ bb = lmcf->busy_buf_ptrs; -+ for (i = hc->nbusy; i > 0; i--) { -+ b = bb[i - 1]; -+#else - for (i = 0; i < hc->nbusy; i++) { - b = hc->busy[i]; -+#endif - - dd("busy buf: %d: [%.*s]", (int) i, (int) (b->pos - b->start), - b->start); -@@ -223,8 +268,15 @@ - } - - if (hc->nbusy) { -+ -+#if nginx_version >= 1011011 -+ bb = lmcf->busy_buf_ptrs; -+ for (i = hc->nbusy - 1; i >= 0; i--) { -+ b = bb[i]; -+#else - for (i = 0; i < hc->nbusy; i++) { - b = hc->busy[i]; -+#endif - - if (!found) { - if (b != first) { -@@ -1431,4 +1483,20 @@ - #endif /* NGX_LUA_NO_FFI_API */ - - -+#if nginx_version >= 1011011 -+void -+ngx_http_lua_ngx_raw_header_cleanup(void *data) -+{ -+ ngx_http_lua_main_conf_t *lmcf; -+ -+ lmcf = (ngx_http_lua_main_conf_t *) data; -+ -+ if (lmcf->busy_buf_ptrs) { -+ ngx_free(lmcf->busy_buf_ptrs); -+ lmcf->busy_buf_ptrs = NULL; -+ } -+} -+#endif -+ -+ - /* vi:set ft=c ts=4 sw=4 et fdm=marker: */ diff --git a/www/nginx-devel/files/extra-patch-ngx_http_lua_headers.h b/www/nginx-devel/files/extra-patch-ngx_http_lua_headers.h deleted file mode 100644 index 6b71b075ec5..00000000000 --- a/www/nginx-devel/files/extra-patch-ngx_http_lua_headers.h +++ /dev/null @@ -1,12 +0,0 @@ ---- ../lua-nginx-module-0.10.8/src/ngx_http_lua_headers.h.orig 2017-04-15 11:05:40.649209000 -0400 -+++ ../lua-nginx-module-0.10.8/src/ngx_http_lua_headers.h 2017-04-15 11:06:01.658936000 -0400 -@@ -15,6 +15,9 @@ - void ngx_http_lua_inject_resp_header_api(lua_State *L); - void ngx_http_lua_inject_req_header_api(lua_State *L); - void ngx_http_lua_create_headers_metatable(ngx_log_t *log, lua_State *L); -+#if nginx_version >= 1011011 -+void ngx_http_lua_ngx_raw_header_cleanup(void *data); -+#endif - - - #endif /* _NGX_HTTP_LUA_HEADERS_H_INCLUDED_ */ diff --git a/www/nginx-devel/files/extra-patch-ngx_http_lua_ssl_ocsp.c b/www/nginx-devel/files/extra-patch-ngx_http_lua_ssl_ocsp.c deleted file mode 100644 index 5064f337632..00000000000 --- a/www/nginx-devel/files/extra-patch-ngx_http_lua_ssl_ocsp.c +++ /dev/null @@ -1,12 +0,0 @@ ---- ../lua-nginx-module-0.10.8/src/ngx_http_lua_ssl_ocsp.c.orig 2017-04-30 17:32:37.211186000 -0400 -+++ ../lua-nginx-module-0.10.8/src/ngx_http_lua_ssl_ocsp.c 2017-04-30 17:33:42.926721000 -0400 -@@ -490,7 +490,9 @@ - - dd("set ocsp resp: resp_len=%d", (int) resp_len); - (void) SSL_set_tlsext_status_ocsp_resp(ssl_conn, p, resp_len); -+#ifndef LIBRESSL_VERSION_NUMBER - ssl_conn->tlsext_status_expected = 1; -+#endif - - return NGX_OK; - diff --git a/www/nginx-devel/files/extra-patch-ngx_http_redis2_util.c b/www/nginx-devel/files/extra-patch-ngx_http_redis2_util.c deleted file mode 100644 index 9e71d98e640..00000000000 --- a/www/nginx-devel/files/extra-patch-ngx_http_redis2_util.c +++ /dev/null @@ -1,18 +0,0 @@ ---- ../redis2-nginx-module-0.12/src/ngx_http_redis2_util.c.orig 2016-11-20 15:00:28.997903000 -0500 -+++ ../redis2-nginx-module-0.12/src/ngx_http_redis2_util.c 2016-11-20 15:00:44.173323000 -0500 -@@ -77,6 +77,7 @@ - continue; - } - -+#if (nginx_version < 1011006) - if (uscfp[i]->default_port - && url->default_port - && uscfp[i]->default_port != url->default_port) -@@ -84,6 +85,7 @@ - dd("upstream_add: default_port not match"); - continue; - } -+#endif - - return uscfp[i]; - } diff --git a/www/nginx-devel/files/extra-patch-ngx_http_tarantool-config b/www/nginx-devel/files/extra-patch-ngx_http_tarantool-config index ce805292837..e4fa303f290 100644 --- a/www/nginx-devel/files/extra-patch-ngx_http_tarantool-config +++ b/www/nginx-devel/files/extra-patch-ngx_http_tarantool-config @@ -1,20 +1,24 @@ ---- ../nginx_upstream_module-1278ee5/config.orig 2016-08-07 15:39:47.000000000 -0400 -+++ ../nginx_upstream_module-1278ee5/config 2016-08-07 16:38:59.298414000 -0400 -@@ -1,14 +1,14 @@ - ngx_addon_name="ngx_http_tnt_module" - --__lib_yajl="$ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/lib/libyajl_s.a" -+__lib_yajl="%%PREFIX%%/lib/libyajl.so" - - __module_src_dir="$ngx_addon_dir/src" - - __include_paths=" \ - $ngx_addon_dir/src \ +--- ../nginx_upstream_module-4ca8684/config.orig 2017-09-18 11:54:00.000000000 -0400 ++++ ../nginx_upstream_module-4ca8684/config 2017-12-04 21:56:41.978227000 -0500 +@@ -7,18 +7,10 @@ $ngx_addon_dir/third_party \ + " + +-test -f $ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/lib/libyajl_s.a && +-test -f $ngx_addon_dir/third_party/msgpuck/libmsgpuck.a && { +- libs=" \ +- $ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/lib/libyajl_s.a \ +- $ngx_addon_dir/third_party/msgpuck/libmsgpuck.a \ +- " +- +- include_paths="${include_paths} \ - $ngx_addon_dir/third_party/msgpuck \ - $ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/include \ ++include_paths="${include_paths} \ + %%PREFIX%%/include/msgpuck \ + %%PREFIX%%/include/yajl \ " +-} + + module_src_dir="$ngx_addon_dir/src" - __sources=" \ diff --git a/www/p5-Catalyst-View-JSON/Makefile b/www/p5-Catalyst-View-JSON/Makefile index 4168ff903d3..f5df18f2d6c 100644 --- a/www/p5-Catalyst-View-JSON/Makefile +++ b/www/p5-Catalyst-View-JSON/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= Catalyst-View-JSON -PORTVERSION= 0.33 -PORTREVISION= 1 +PORTVERSION= 0.36 CATEGORIES= www perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:MIYAGAWA @@ -11,6 +10,8 @@ PKGNAMEPREFIX= p5- MAINTAINER= kuriyama@FreeBSD.org COMMENT= Catalyst View handler that returns stash data in JSON format +LICENSE= ART10 + BUILD_DEPENDS= p5-Catalyst-Runtime>=5.6000:www/p5-Catalyst-Runtime \ p5-JSON-Any>=1.15:converters/p5-JSON-Any \ p5-MRO-Compat>0:devel/p5-MRO-Compat diff --git a/www/p5-Catalyst-View-JSON/distinfo b/www/p5-Catalyst-View-JSON/distinfo index 357dfd4ad86..63ec6733847 100644 --- a/www/p5-Catalyst-View-JSON/distinfo +++ b/www/p5-Catalyst-View-JSON/distinfo @@ -1,2 +1,3 @@ -SHA256 (Catalyst-View-JSON-0.33.tar.gz) = 31ba3ed1f291937f20a0d4ba0f8b8a4db62cdef1430907499ddc3a367552cd0f -SIZE (Catalyst-View-JSON-0.33.tar.gz) = 26777 +TIMESTAMP = 1512406665 +SHA256 (Catalyst-View-JSON-0.36.tar.gz) = 5447f6cc360ab34e4880c74e8db9b05e216b750f3ab7efadc21f6461831c2475 +SIZE (Catalyst-View-JSON-0.36.tar.gz) = 29790 diff --git a/www/py-flexget/Makefile b/www/py-flexget/Makefile index bd4f4f15f2f..d812c1529cf 100644 --- a/www/py-flexget/Makefile +++ b/www/py-flexget/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= flexget -PORTVERSION= 2.10.104 +PORTVERSION= 2.11.6 PORTEPOCH= 1 CATEGORIES= www python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-flexget/distinfo b/www/py-flexget/distinfo index 98cb0145e4b..ca8fe5dcafc 100644 --- a/www/py-flexget/distinfo +++ b/www/py-flexget/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1508811383 -SHA256 (flexget-Flexget-2.10.104_GH0.tar.gz) = 978de46e779f2965b32c50a438ba8ccae7aba85b3059da8152bb489749130d71 -SIZE (flexget-Flexget-2.10.104_GH0.tar.gz) = 6774232 +TIMESTAMP = 1512093898 +SHA256 (flexget-Flexget-2.11.6_GH0.tar.gz) = 2c51f8e3028e5f008be9375b04155e677c57dc3868da27e81a3df240608d42f2 +SIZE (flexget-Flexget-2.11.6_GH0.tar.gz) = 6901281 diff --git a/www/waterfox/Makefile b/www/waterfox/Makefile index a83940c5913..da9a906e9fa 100644 --- a/www/waterfox/Makefile +++ b/www/waterfox/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= waterfox -DISTVERSION= 56.0.s20171130 -PORTREVISION= 1 +DISTVERSION= 56.0.s20171203 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org @@ -33,7 +32,7 @@ LIB_DEPENDS= libv4l2.so:multimedia/libv4l USE_GITHUB= yes GH_ACCOUNT= MrAlex94 GH_PROJECT= Waterfox -GH_TAGNAME= 8c17fb8d3c7f +GH_TAGNAME= eadf0f15d05e USE_GECKO= gecko MOZ_PKGCONFIG_FILES= # empty diff --git a/www/waterfox/distinfo b/www/waterfox/distinfo index 2dc6f7d1d9c..6a28ba4d752 100644 --- a/www/waterfox/distinfo +++ b/www/waterfox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1512000823 -SHA256 (MrAlex94-Waterfox-56.0.s20171130-8c17fb8d3c7f_GH0.tar.gz) = 6d452052eb4eb618459a39ebe41ed343312cf07bc1f9668c550502844b376dcc -SIZE (MrAlex94-Waterfox-56.0.s20171130-8c17fb8d3c7f_GH0.tar.gz) = 394188551 +TIMESTAMP = 1512266552 +SHA256 (MrAlex94-Waterfox-56.0.s20171203-eadf0f15d05e_GH0.tar.gz) = edc9c603192ad20ddddbf3f9c1557619c05c545fb10ca33435c79239ff667505 +SIZE (MrAlex94-Waterfox-56.0.s20171203-eadf0f15d05e_GH0.tar.gz) = 394204922 diff --git a/www/waterfox/files/patch-typos b/www/waterfox/files/patch-typos index 5021b5e5b21..e7f8099c603 100644 --- a/www/waterfox/files/patch-typos +++ b/www/waterfox/files/patch-typos @@ -10,17 +10,6 @@ Mismerges found by comparing changes with Firefox 56 if (elem) { elem->NodeInfoChanged(newDoc); } ---- netwerk/test/unit/test_idn_urls.js.orig -+++ netwerk/test/unit/test_idn_urls.js -@@ -286,7 +286,7 @@ const testcases = [ - // Thai (also tests that node with over 63 UTF-8 octets doesn't fail) - ["เครื่องทําน้ําทําน้ําแข็ง", - "xn--22cdjb2fanb9fyepcbbb9dwh4a3igze4fdcd", -- false, true, true] -+ false, true, true], - - // Effect of adding valid or invalid subdomains (bug 1399540) - ["䕮䕵䕶䕱.ascii", "xn--google.ascii", false, true, true], --- security/nss/lib/softoken/softkver.h.orig +++ security/nss/lib/softoken/softkver.h @@ -26,6 +26,6 @@ diff --git a/x11-toolkits/py-wax/Makefile b/x11-toolkits/py-wax/Makefile index 3bb6d2e2314..1b82783af0a 100644 --- a/x11-toolkits/py-wax/Makefile +++ b/x11-toolkits/py-wax/Makefile @@ -12,7 +12,7 @@ MAINTAINER= nivit@FreeBSD.org COMMENT= User-friendly layer on top of wxPython NO_BUILD= yes -USES= python +USES= python:2.7 USE_WX= 2.8 WX_COMPS= python:run diff --git a/x11/wbarconf/Makefile b/x11/wbarconf/Makefile index 15fefee76cb..6239ce08762 100644 --- a/x11/wbarconf/Makefile +++ b/x11/wbarconf/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv3 RUN_DEPENDS= wbar:x11/wbar USE_GNOME= pygobject pygtk2 gtk20 -USES= gettext desktop-file-utils python shebangfix +USES= gettext desktop-file-utils python:2.7 shebangfix SHEBANG_FILES= ${WRKSRC}/wbarconf python_OLD_CMD= "/usr/bin/env python2" NO_BUILD= yes diff --git a/x11/xcurs/Makefile b/x11/xcurs/Makefile index 511b5546012..5ec6ed65a3f 100644 --- a/x11/xcurs/Makefile +++ b/x11/xcurs/Makefile @@ -11,9 +11,9 @@ MASTER_SITES= http://freebsd.nsu.ru/distfiles/ \ MAINTAINER= ports@FreeBSD.org COMMENT= Editor for new X.Org style full-color cursors properties -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} -USES= python +USES= python:2.7 USE_GNOME= pygtk2 NO_BUILD= yes