Attachment 174163 Details for Bug 212220 – www_trafficserver.diff

[patch] www_trafficserver.diff

www_trafficserver.diff (text/plain), 5.87 KB, created by Hung-Yi Chen on 2016-08-28 17:58:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hung-Yi Chen

Created: 2016-08-28 17:58:51 UTC

Size: 5.87 KB

patch

obsolete

>Index: www/trafficserver/Makefile
>===================================================================
>--- www/trafficserver/Makefile	(revision 421029)
>+++ www/trafficserver/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	trafficserver
>-PORTVERSION=	6.1.1
>+PORTVERSION=	6.2.0
> CATEGORIES=	www
> MASTER_SITES=	APACHE/${PORTNAME}
> 
>@@ -18,12 +18,11 @@
> 
> GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
>-USES=		cpe execinfo gmake libtool perl5 pkgconfig sqlite tar:bzip2 tcl
>+USES=		cpe execinfo gmake libtool perl5 pkgconfig sqlite ssl tar:bzip2 tcl
> CPE_VENDOR=	apache
> CPE_PRODUCT=	traffic_server
> USE_PERL5=	build run
> USE_LDCONFIG=	yes
>-USE_OPENSSL=	yes
> USE_RC_SUBR=	${PORTNAME}
> 
> ONLY_FOR_ARCHS=	amd64
>@@ -44,37 +43,17 @@
> 		--with-user=${USERS} \
> 		--with-group=${GROUPS}
> 
>-OPTIONS_DEFINE=	DOCS INTERIM WCCP SPDY
>-OPTIONS_RADIO=	MEMMAN
>-OPTIONS_RADIO_MEMMAN=	ALLOCATORS FREELISTS RECLAIM
>-OPTIONS_DEFAULT=	FREELISTS
>+OPTIONS_DEFINE=	DOCS WCCP SPDY
> 
> WCCP_DESC=	Enable WCCPv2 protocol
>-INTERIM_DESC=	Enable interim cache (SSD)
>-ALLOCATORS_DESC=	Manage memory with allocators
>-FREELISTS_DESC=	Manage memory with freelists
>-RECLAIM_DESC=	Reclaim unused memory in freelists
> SPDY_DESC=	Enable SPDY
> 
> WCCP_CONFIGURE_ENABLE=	wccp
>-INTERIM_CONFIGURE_ENABLE=	interim-cache
> SPDY_CONFIGURE_ENABLE=	spdy
> SPDY_LIB_DEPENDS=	libspdylay.so:www/spdylay
> 
> BROKEN_FreeBSD_9=	Trafficserver is only supported on FreeBSD 10.1 or newer
> 
>-.include <bsd.port.options.mk>
>-
>-.if ${PORT_OPTIONS:MRECLAIM}
>-CONFIGURE_ARGS+=	--enable-reclaimable-freelist --enable-freelist
>-.elif ${PORT_OPTIONS:MFREELISTS}
>-CONFIGURE_ARGS+=	--enable-freelist
>-.elif ${PORT_OPTIONS:MALLOCATORS}
>-CONFIGURE_ARGS+=	--disable-freelist
>-.else
>-IGNORE=	no allocation strategy selected
>-.endif
>-
> .if ! exists(/var/cache)
> # FreeBSD 8.x
> PLIST_DIRS+=	/var/cache
>Index: www/trafficserver/distinfo
>===================================================================
>--- www/trafficserver/distinfo	(revision 421029)
>+++ www/trafficserver/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (trafficserver-6.1.1.tar.bz2) = 67ddd7fc79e4435f353b2aa8937a7b205f217ca15beba3adb5213a92f9527d8b
>-SIZE (trafficserver-6.1.1.tar.bz2) = 7849045
>+TIMESTAMP = 1472401430
>+SHA256 (trafficserver-6.2.0.tar.bz2) = bd5e8c178d02957b89a81d1e428ee50bcca0831a6917f32408915c56f486fd85
>+SIZE (trafficserver-6.2.0.tar.bz2) = 8437286
>Index: www/trafficserver/files/patch-iocore__eventsystem__UnixEventProcessor.cc
>===================================================================
>--- www/trafficserver/files/patch-iocore__eventsystem__UnixEventProcessor.cc	(revision 421029)
>+++ www/trafficserver/files/patch-iocore__eventsystem__UnixEventProcessor.cc	(nonexistent)
>@@ -1,10 +0,0 @@
>---- iocore/eventsystem/UnixEventProcessor.cc.orig	2015-09-08 17:43:45 UTC
>-+++ iocore/eventsystem/UnixEventProcessor.cc
>-@@ -24,7 +24,6 @@
>- #include "P_EventSystem.h" /* MAGIC_EDITING_TAG */
>- #include <sched.h>
>- #if TS_USE_HWLOC
>--#include <alloca.h>
>- #include <hwloc.h>
>- #endif
>- #include "ts/ink_defs.h"
>
>Property changes on: www/trafficserver/files/patch-iocore__eventsystem__UnixEventProcessor.cc
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: www/trafficserver/files/patch-lib__perl__Makefile.in
>===================================================================
>--- www/trafficserver/files/patch-lib__perl__Makefile.in	(nonexistent)
>+++ www/trafficserver/files/patch-lib__perl__Makefile.in	(working copy)
>@@ -0,0 +1,11 @@
>+--- lib/perl/Makefile.in.orig	2016-08-29 00:27:40.715518000 +0800
>++++ lib/perl/Makefile.in	2016-08-29 00:28:18.123308000 +0800
>+@@ -717,7 +717,7 @@
>+ # copy them to the build directory if we are building out of tree.
>+ Makefile-pl: Makefile.PL
>+ 	test -f "$(top_builddir)/$(subdir)/Makefile.PL" || cp -rf "$(srcdir)/." "$(top_builddir)/$(subdir)/"
>+-	$(PERL) Makefile.PL INSTALLDIRS=$(INSTALLDIRS) INSTALL_BASE=$(prefix) PREFIX=
>++	$(PERL) Makefile.PL
>+ 
>+ distclean-local:
>+ 	-rm -rf Makefile-pl MYMETA.* blip
>
>Property changes on: www/trafficserver/files/patch-lib__perl__Makefile.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/trafficserver/pkg-plist
>===================================================================
>--- www/trafficserver/pkg-plist	(revision 421029)
>+++ www/trafficserver/pkg-plist	(working copy)
>@@ -22,7 +22,6 @@
> @(%%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#redirect_url
> @(%%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
>@@ -54,6 +53,7 @@
> @sample %%ETCDIR%%/ip_allow.config.sample
> @sample %%ETCDIR%%/log_hosts.config.sample
> @sample %%ETCDIR%%/logs_xml.config.sample
>+@sample %%ETCDIR%%/metrics.config.sample
> @sample %%ETCDIR%%/parent.config.sample
> @sample %%ETCDIR%%/plugin.config.sample
> @sample %%ETCDIR%%/records.config.sample
>@@ -116,6 +116,7 @@
> libexec/trafficserver/AsyncTimer.so
> libexec/trafficserver/ClientRedirect.so
> libexec/trafficserver/ClientRequest.so
>+libexec/trafficserver/CustomErrorRemapPlugin.so
> libexec/trafficserver/CustomResponse.so
> libexec/trafficserver/GlobalHookPlugin.so
> libexec/trafficserver/GzipTransformationPlugin.so

Actions: View | Diff

Attachments on bug 212220: 174163