diff --git a/www/trafficserver/Makefile b/www/trafficserver/Makefile index 96a3ea79f641..c18d11cf8bf7 100644 --- a/www/trafficserver/Makefile +++ b/www/trafficserver/Makefile @@ -1,91 +1,90 @@ # Created by: Jui-Nan Lin PORTNAME= trafficserver -PORTVERSION= 9.0.1 +PORTVERSION= 9.1.1 CATEGORIES= www MASTER_SITES= APACHE/${PORTNAME} MAINTAINER= gaod@hychen.org COMMENT= Fast, scalable and extensible HTTP proxy server LICENSE= APACHE20 ONLY_FOR_ARCHS= amd64 powerpc64 powerpc64le LIB_DEPENDS= libcurl.so:ftp/curl \ libhwloc.so:devel/hwloc2 \ libpcre.so:devel/pcre \ libxml2.so:textproc/libxml2 \ libbrotlienc.so:archivers/brotli \ ${LIB_DEPENDS_${ARCH}} LIB_DEPENDS_amd64= libluajit-5.1.so:lang/luajit LIB_DEPENDS_powerpc64= libluajit-5.1.so:lang/luajit-openresty LIB_DEPENDS_powerpc64le= libluajit-5.1.so:lang/luajit-openresty USES= compiler:c++17-lang cpe gmake libtool localbase ncurses \ pathfix perl5 pkgconfig sqlite ssl tar:bzip2 tcl CPE_VENDOR= apache CPE_PRODUCT= traffic_server USE_PERL5= build run USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USERS= ${WWWOWN} GROUPS= ${WWWGRP} PLIST_SUB= WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" PORTVERSION="${PORTVERSION}" CONFIGURE_ARGS= --with-pcre=${LOCALBASE} \ --with-openssl=${OPENSSLBASE} \ --with-tcl=${TCL_LIBDIR} \ --localstatedir=/var \ --with-user=${USERS} \ --with-group=${GROUPS} \ --disable-maintainer-mode \ --disable-dependency-tracking \ --enable-mime-sanity-check \ --enable-experimental-plugins OPTIONS_DEFINE= DOCS WCCP MEMCACHED IMAGEMAGICK X11 OPTIONS_SUB= yes PLIST_SUB+= ARCH="${ARCH:C/powerpc64.*/powerpc/}" WCCP_DESC= Enable WCCPv2 protocol WCCP_CONFIGURE_ENABLE= wccp -WCCP_USE= GCC=yes MEMCACHED_DESC= Enable memcache & memcached_remap plugin MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached IMAGEMAGICK_DESC= Enable ats-magick & webp convert plugin .include .if ${PORT_OPTIONS:MIMAGEMAGICK} .if ${PORT_OPTIONS:MX11} USES+= magick:6 .else USES+= magick:6,nox11 .endif .endif post-patch: @${REINPLACE_CMD} \ -e '/cachedir:/s,$${localstatedir}+,$${localstatedir}/cache+,' \ -e '/runtimedir:/s,$${localstatedir}+,$${localstatedir}/run+,' \ ${WRKSRC}/config.layout @${REINPLACE_CMD} -e 's/#ifdef HAVE_EVENTFD/#if defined(HAVE_EVENTFD) \&\& TS_USE_EPOLL == 1/' \ ${WRKSRC}/src/tscore/EventNotify.cc \ ${WRKSRC}/include/tscore/EventNotify.h post-install: ${RMDIR} ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${ETCDIR}/snapshots (cd ${STAGEDIR}${ETCDIR} && for f in *.config *.yaml; do ${MV} $$f $$f.sample; done) ${SED} -i '' -e 's|^${STAGEDIR}||g' \ ${STAGEDIR}${PREFIX}/lib/perl5/${ARCH:C/powerpc64.*/powerpc/}-freebsd-thread-multi/auto/Apache/TS/.packlist .include diff --git a/www/trafficserver/distinfo b/www/trafficserver/distinfo index 4a098e240624..3d9cf67a9dc2 100644 --- a/www/trafficserver/distinfo +++ b/www/trafficserver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1618942776 -SHA256 (trafficserver-9.0.1.tar.bz2) = bf00d0399e359f2b52bb0664743e5ccd81c6a9491eafe1ff1b10afeaf62526e0 -SIZE (trafficserver-9.0.1.tar.bz2) = 9451249 +TIMESTAMP = 1639503466 +SHA256 (trafficserver-9.1.1.tar.bz2) = 90cfa975858d50bc1995bee195f13ff45497773c2f90363332516fd3fdafd7e8 +SIZE (trafficserver-9.1.1.tar.bz2) = 9780373 diff --git a/www/trafficserver/files/patch-proxy__hdrs__MIME.cc b/www/trafficserver/files/patch-proxy__hdrs__MIME.cc new file mode 100644 index 000000000000..ab54a80356d5 --- /dev/null +++ b/www/trafficserver/files/patch-proxy__hdrs__MIME.cc @@ -0,0 +1,11 @@ +--- proxy/hdrs/MIME.cc.orig 2021-10-25 02:21:39.744130000 +0800 ++++ proxy/hdrs/MIME.cc 2021-10-25 02:22:01.829261000 +0800 +@@ -557,7 +557,7 @@ + return sum; + } + +-#ifdef DEBUG ++#ifdef ENABLE_MIME_SANITY_CHECK + void + mime_hdr_sanity_check(MIMEHdrImpl *mh) + { diff --git a/www/trafficserver/pkg-plist b/www/trafficserver/pkg-plist index 0b497c02db7d..9f9154207e60 100644 --- a/www/trafficserver/pkg-plist +++ b/www/trafficserver/pkg-plist @@ -1,190 +1,194 @@ @rmempty %%ETCDIR%%/proxy.pac bin/traffic_cache_tool bin/traffic_crashlog bin/traffic_ctl bin/traffic_layout bin/traffic_logcat bin/traffic_logstats bin/traffic_manager bin/traffic_server bin/traffic_top bin/traffic_via %%WCCP%%bin/traffic_wccp bin/trafficserver bin/tspush bin/tsxs %%ETCDIR%%/trafficserver-release @owner %%WWWOWN%% @group %%WWWGRP%% @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/.body_factory_info @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/README @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/access#denied @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/access#proxy_auth_required @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/access#ssl_forbidden @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/cache#not_in_cache @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/cache#read_error @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/connect#dns_failed @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/connect#failed_connect @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/connect#hangup @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/default @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/interception#no_host @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/redirect#moved_permanently @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/redirect#moved_temporarily @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/request#cycle_detected @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/request#invalid_content_length @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/request#no_content_length @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/request#no_host @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/request#scheme_unsupported @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/request#syntax_error @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/request#uri_len_too_long @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/response#bad_response @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/response#bad_version @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/timeout#activity @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/timeout#inactivity @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/transcoding#unsupported @(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default/urlrouting#no_mapping @sample %%ETCDIR%%/cache.config.sample @sample %%ETCDIR%%/hosting.config.sample @sample %%ETCDIR%%/ip_allow.yaml.sample @sample %%ETCDIR%%/logging.yaml.sample @sample %%ETCDIR%%/parent.config.sample @sample %%ETCDIR%%/plugin.config.sample @sample %%ETCDIR%%/records.config.sample @sample %%ETCDIR%%/remap.config.sample @sample %%ETCDIR%%/sni.yaml.sample @sample %%ETCDIR%%/socks.config.sample @sample %%ETCDIR%%/splitdns.config.sample @sample %%ETCDIR%%/ssl_multicert.config.sample @sample %%ETCDIR%%/storage.config.sample @sample %%ETCDIR%%/strategies.yaml.sample @sample %%ETCDIR%%/volume.config.sample include/ts/apidefs.h include/ts/experimental.h include/ts/mgmtapi.h include/ts/remap.h include/ts/ts.h include/tscpp/api/Async.h include/tscpp/api/AsyncHttpFetch.h include/tscpp/api/AsyncTimer.h include/tscpp/api/CaseInsensitiveStringComparator.h include/tscpp/api/ClientRequest.h include/tscpp/api/Continuation.h include/tscpp/api/GlobalPlugin.h include/tscpp/api/GzipDeflateTransformation.h include/tscpp/api/GzipInflateTransformation.h include/tscpp/api/Headers.h include/tscpp/api/HttpMethod.h include/tscpp/api/HttpStatus.h include/tscpp/api/HttpVersion.h include/tscpp/api/InterceptPlugin.h include/tscpp/api/Logger.h include/tscpp/api/Plugin.h include/tscpp/api/PluginInit.h include/tscpp/api/RemapPlugin.h include/tscpp/api/Request.h include/tscpp/api/Response.h include/tscpp/api/Stat.h include/tscpp/api/Transaction.h include/tscpp/api/TransactionPlugin.h include/tscpp/api/TransformationPlugin.h include/tscpp/api/Url.h include/tscpp/api/noncopyable.h include/tscpp/api/utils.h include/tscpp/util/IntrusiveDList.h +include/tscpp/util/LocalBuffer.h include/tscpp/util/PostScript.h include/tscpp/util/TextView.h lib/libtscore.so lib/libtscore.so.9 lib/libtscore.so.%%PORTVERSION%% lib/libtscppapi.so lib/libtscppapi.so.9 lib/libtscppapi.so.%%PORTVERSION%% lib/libtscpputil.so lib/libtscpputil.so.9 lib/libtscpputil.so.%%PORTVERSION%% lib/libtsmgmt.so lib/libtsmgmt.so.9 lib/libtsmgmt.so.%%PORTVERSION%% lib/plugin_init_fail.so lib/plugin_instinit_fail.so lib/plugin_missing_deleteinstance.so lib/plugin_missing_doremap.so lib/plugin_missing_init.so lib/plugin_missing_newinstance.so lib/plugin_required_cb.so lib/plugin_testing_calls.so lib/plugin_v1.so lib/plugin_v2.so libdata/pkgconfig/trafficserver.pc -%%IMAGEMAGICK%%libexec/trafficserver/WebpTransform.so libexec/trafficserver/access_control.so libexec/trafficserver/acme.so libexec/trafficserver/authproxy.so libexec/trafficserver/background_fetch.so +libexec/trafficserver/cache_fill.so libexec/trafficserver/cache_promote.so libexec/trafficserver/cache_range_requests.so libexec/trafficserver/cachekey.so libexec/trafficserver/cert_reporting_tool.so libexec/trafficserver/certifier.so libexec/trafficserver/collapsed_forwarding.so libexec/trafficserver/combo_handler.so libexec/trafficserver/compress.so libexec/trafficserver/conf_remap.so libexec/trafficserver/cookie_remap.so libexec/trafficserver/custom_redirect.so libexec/trafficserver/escalate.so libexec/trafficserver/esi.so libexec/trafficserver/fq_pacing.so libexec/trafficserver/generator.so libexec/trafficserver/geoip_acl.so libexec/trafficserver/header_freq.so libexec/trafficserver/header_rewrite.so libexec/trafficserver/hook-trace.so +libexec/trafficserver/icap.so libexec/trafficserver/inliner.so libexec/trafficserver/ja3_fingerprint.so libexec/trafficserver/libloader.so %%IMAGEMAGICK%%libexec/trafficserver/magick.so libexec/trafficserver/memory_profile.so libexec/trafficserver/metalink.so libexec/trafficserver/money_trace.so libexec/trafficserver/mp4.so libexec/trafficserver/multiplexer.so libexec/trafficserver/prefetch.so +libexec/trafficserver/rate_limit.so libexec/trafficserver/redo_cache_lookup.so libexec/trafficserver/regex_remap.so libexec/trafficserver/regex_revalidate.so libexec/trafficserver/remap_purge.so libexec/trafficserver/remap_stats.so libexec/trafficserver/s3_auth.so libexec/trafficserver/server_push_preload.so libexec/trafficserver/slice.so libexec/trafficserver/sslheaders.so libexec/trafficserver/statichit.so libexec/trafficserver/stats_over_http.so libexec/trafficserver/stream_editor.so libexec/trafficserver/system_stats.so libexec/trafficserver/tcpinfo.so libexec/trafficserver/tls_bridge.so libexec/trafficserver/traffic_dump.so libexec/trafficserver/tslua.so libexec/trafficserver/tsmemcache.so libexec/trafficserver/url_sig.so +%%IMAGEMAGICK%%libexec/trafficserver/webp_transform.so libexec/trafficserver/xdebug.so lib/perl5/%%ARCH%%-freebsd-thread-multi/auto/Apache/TS/.packlist lib/perl5/%%ARCH%%-freebsd-thread-multi/perllocal.pod lib/perl5/Apache/TS.pm lib/perl5/Apache/TS/AdminClient.pm lib/perl5/Apache/TS/Config.pm lib/perl5/Apache/TS/Config/Records.pm man/man3/Apache::TS.3.gz man/man3/Apache::TS::AdminClient.3.gz man/man3/Apache::TS::Config::Records.3.gz @dir(,,) libexec/trafficserver @dir(,,) include/ts @dir(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory/default @dir(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/body_factory @dir(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%%/snapshots @dir(%%WWWOWN%%,%%WWWGRP%%,) %%ETCDIR%% @dir(%%WWWOWN%%,%%WWWGRP%%,) /var/cache/trafficserver @dir(%%WWWOWN%%,%%WWWGRP%%,) /var/log/trafficserver @dir(%%WWWOWN%%,%%WWWGRP%%,) /var/run/trafficserver