Date: Wed, 30 Jul 2014 07:59:08 +0000 (UTC) From: Li-Wen Hsu <lwhsu@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363452 - in head/www/trafficserver: . files Message-ID: <201407300759.s6U7x844072343@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lwhsu Date: Wed Jul 30 07:59:07 2014 New Revision: 363452 URL: http://svnweb.freebsd.org/changeset/ports/363452 QAT: https://qat.redports.org/buildarchive/r363452/ Log: - Update to 5.0.0 [1] - Transfer maintainership [2] PR: 192076 [1] 184160 [2] Submitted by: gaod@hychen.org [1][2] Added: head/www/trafficserver/files/patch-cmd__traffic_cop__Makefile.am (contents, props changed) head/www/trafficserver/files/patch-iocore__eventsystem__UnixEventProcessor.cc (contents, props changed) head/www/trafficserver/files/patch-lib__Makefile.am (contents, props changed) head/www/trafficserver/files/patch-lib__luajit__src__Makefile (contents, props changed) Deleted: head/www/trafficserver/files/patch-build__xml.m4 head/www/trafficserver/files/patch-cop__Makefile.am head/www/trafficserver/files/patch-cop__TrafficCop.cc head/www/trafficserver/files/patch-example__protocol__Protocol.c head/www/trafficserver/files/patch-lib__atscppapi__src__GzipDeflateTransformation.cc head/www/trafficserver/files/patch-lib__atscppapi__src__GzipInflateTransformation.cc head/www/trafficserver/files/patch-lib__atscppapi__src__Logger.cc head/www/trafficserver/files/patch-lib__atscppapi__src__TransformationPlugin.cc head/www/trafficserver/files/patch-lib__atscppapi__src__include__atscppapi__shared_ptr.h head/www/trafficserver/files/patch-lib__atscppapi__src__include__atscppapi__utils.h head/www/trafficserver/files/patch-mgmt__api__remote__Makefile.am head/www/trafficserver/files/patch-mgmt__cli__cliMain.cc Modified: head/www/trafficserver/Makefile head/www/trafficserver/distinfo head/www/trafficserver/pkg-plist Modified: head/www/trafficserver/Makefile ============================================================================== --- head/www/trafficserver/Makefile Wed Jul 30 07:57:34 2014 (r363451) +++ head/www/trafficserver/Makefile Wed Jul 30 07:59:07 2014 (r363452) @@ -2,34 +2,32 @@ # $FreeBSD$ PORTNAME= trafficserver -PORTVERSION= 4.1.2 -PORTREVISION= 4 +PORTVERSION= 5.0.0 CATEGORIES= www MASTER_SITES= APACHE/${PORTNAME} -MAINTAINER= jnlin@csie.nctu.edu.tw +MAINTAINER= gaod@hychen.org COMMENT= Fast, scalable and extensible HTTP proxy server LICENSE= APACHE20 -LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ - libpcre.so:${PORTSDIR}/devel/pcre \ - libxml2.so:${PORTSDIR}/textproc/libxml2 \ - libboost_system.so:${PORTSDIR}/devel/boost-libs \ +LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs \ libcurl.so:${PORTSDIR}/ftp/curl \ + libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ libhwloc.so:${PORTSDIR}/devel/hwloc \ - libluajit-${LUA_VER}.so:${PORTSDIR}/lang/luajit + libpcre.so:${PORTSDIR}/devel/pcre \ + libxml2.so:${PORTSDIR}/textproc/libxml2 GNU_CONFIGURE= yes -USES= gmake libtool lua:51 perl5 pkgconfig tar:bzip2 tcl -USE_AUTOTOOLS= aclocal autoconf autoheader automake -AUTOMAKE_ARGS= -a -c -f +USES= gmake perl5 pkgconfig tar:bzip2 tcl +USE_AUTOTOOLS= aclocal autoconf automake libtool +USE_LDCONFIG= yes USE_OPENSSL= yes -USE_SQLITE= yes USE_RC_SUBR= ${PORTNAME} -USE_LDCONFIG= yes -USE_PERL5= run build fixpacklist +USE_SQLITE= yes + ONLY_FOR_ARCHS= i386 amd64 + USERS= www GROUPS= nogroup @@ -49,6 +47,8 @@ CONFIGURE_ARGS= --with-libxml2=${LOCALBA --with-user=${USERS} \ --with-group=${GROUPS} +ACLOCAL_ARGS= -I build + OPTIONS_DEFINE= WCCP INTERIM OPTIONS_RADIO= MEMMAN OPTIONS_RADIO_MEMMAN= ALLOCATORS FREELISTS RECLAIM @@ -75,6 +75,11 @@ CONFIGURE_ARGS+= --disable-freelist FORBIDDEN= No allocation strategy selected .endif +.if ${OSVERSION} >= 900033 && exists(/usr/bin/clang) +CC= clang +CXX= clang++ +.endif + post-install: @${MKDIR} ${STAGEDIR}${ETCDIR}/snapshots @cd ${STAGEDIR}${ETCDIR} && for f in *.config *.config.xml; do ${MV} $$f $$f.default; done Modified: head/www/trafficserver/distinfo ============================================================================== --- head/www/trafficserver/distinfo Wed Jul 30 07:57:34 2014 (r363451) +++ head/www/trafficserver/distinfo Wed Jul 30 07:59:07 2014 (r363452) @@ -1,2 +1,2 @@ -SHA256 (trafficserver-4.1.2.tar.bz2) = 16bf75bd22ed2a1ee2bc6bac38add34feffa9c12e787d73b2721eb3042698ef9 -SIZE (trafficserver-4.1.2.tar.bz2) = 6358857 +SHA256 (trafficserver-5.0.0.tar.bz2) = 2fce878bdb8072c9434a7acb6510752a969877541af082360f28e2caf64ba547 +SIZE (trafficserver-5.0.0.tar.bz2) = 7440958 Added: head/www/trafficserver/files/patch-cmd__traffic_cop__Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/trafficserver/files/patch-cmd__traffic_cop__Makefile.am Wed Jul 30 07:59:07 2014 (r363452) @@ -0,0 +1,11 @@ +--- cmd/traffic_cop/Makefile.am.orig 2014-07-06 22:47:46.211841000 +0800 ++++ cmd/traffic_cop/Makefile.am 2014-07-06 22:49:18.103855000 +0800 +@@ -17,6 +17,8 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + ++AUTOMAKE_OPTIONS= subdir-objects ++ + AM_CPPFLAGS = $(iocore_include_dirs) \ + -I$(top_srcdir)/lib \ + -I$(top_srcdir)/lib/records \ Added: head/www/trafficserver/files/patch-iocore__eventsystem__UnixEventProcessor.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/trafficserver/files/patch-iocore__eventsystem__UnixEventProcessor.cc Wed Jul 30 07:59:07 2014 (r363452) @@ -0,0 +1,10 @@ +--- iocore/eventsystem/UnixEventProcessor.cc.orig 2014-07-07 00:33:37.106586000 +0800 ++++ iocore/eventsystem/UnixEventProcessor.cc 2014-07-07 00:34:18.143512000 +0800 +@@ -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 "ink_defs.h" Added: head/www/trafficserver/files/patch-lib__Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/trafficserver/files/patch-lib__Makefile.am Wed Jul 30 07:59:07 2014 (r363452) @@ -0,0 +1,11 @@ +--- lib/Makefile.am.orig 2014-07-07 03:26:27.267047000 +0800 ++++ lib/Makefile.am 2014-07-07 03:26:40.961339000 +0800 +@@ -49,7 +49,7 @@ + test -d "$(top_srcdir)/$(subdir)/luajit/src" || (cd "$(top_srcdir)" && git submodule update --init) + test -d "$(top_builddir)/$(subdir)/luajit/src" || cp -rf "$(srcdir)/luajit" "$(top_builddir)/$(subdir)/" + cd luajit && $(MAKE) $(AM_MAKEFLAGS) BUILDMODE="static" PREFIX="$(prefix)" CC="$(CC)" \ +- CFLAGS="$(LUA_CFLAGS)" LDFLAGS="@LUA_LDFLAGS@" ++ CFLAGS="$(LUA_CFLAGS)" LDFLAGS="@LUA_LDFLAGS@ ${LDFLAGS}" + + clean-local: + test "$(top_srcdir)" != "$(top_builddir)" || (cd "$(top_builddir)/$(subdir)/luajit" && make clean) Added: head/www/trafficserver/files/patch-lib__luajit__src__Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/trafficserver/files/patch-lib__luajit__src__Makefile Wed Jul 30 07:59:07 2014 (r363452) @@ -0,0 +1,20 @@ +--- lib/luajit/src/Makefile.orig 2014-06-16 05:17:49.000000000 +0800 ++++ lib/luajit/src/Makefile 2014-07-07 01:09:35.726810000 +0800 +@@ -25,7 +25,7 @@ + # with "make clean", followed by "make" if you change any options. + # + # LuaJIT builds as a native 32 or 64 bit binary by default. +-CC= gcc ++#CC= gcc + # + # Use this if you want to force a 32 bit build on a 64 bit multilib OS. + #CC= gcc -m32 +@@ -313,7 +313,7 @@ + TARGET_DYNXLDOPTS= + TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER) + else +- ifneq (,$(findstring stack-protector,$(shell $(TARGET_CC) -dumpspecs))) ++ ifneq (,$(findstring stack-protector,$(shell $(TARGET_CC)))) + TARGET_XCFLAGS+= -fno-stack-protector + endif + ifneq (SunOS,$(TARGET_SYS)) Modified: head/www/trafficserver/pkg-plist ============================================================================== --- head/www/trafficserver/pkg-plist Wed Jul 30 07:57:34 2014 (r363451) +++ head/www/trafficserver/pkg-plist Wed Jul 30 07:59:07 2014 (r363452) @@ -27,7 +27,6 @@ bin/traffic_logstats bin/traffic_manager bin/traffic_sac bin/traffic_server -bin/traffic_shell bin/trafficserver bin/tspush bin/tstop @@ -62,21 +61,29 @@ include/atscppapi/Url.h include/atscppapi/noncopyable.h include/atscppapi/shared_ptr.h include/atscppapi/utils.h +lib/libatscppapi.la lib/libatscppapi.so -lib/libatscppapi.so.4 -lib/libatscppapi.so.4.1.2 +lib/libatscppapi.so.5 +lib/libtsmgmt.la lib/libtsmgmt.so -lib/libtsmgmt.so.4 -lib/libtsmgmt.so.4.1.2 +lib/libtsmgmt.so.5 +lib/libtsmgmtshare.la +lib/libtsmgmtshare.so +lib/libtsmgmtshare.so.5 +lib/libtsutil.la lib/libtsutil.so -lib/libtsutil.so.4 -lib/libtsutil.so.4.1.2 +lib/libtsutil.so.5 +libexec/trafficserver/cacheurl.la libexec/trafficserver/cacheurl.so +libexec/trafficserver/conf_remap.la libexec/trafficserver/conf_remap.so +libexec/trafficserver/gzip.la libexec/trafficserver/gzip.so -libexec/trafficserver/header_filter.so +libexec/trafficserver/libloader.la libexec/trafficserver/libloader.so +libexec/trafficserver/regex_remap.la libexec/trafficserver/regex_remap.so +libexec/trafficserver/stats_over_http.la libexec/trafficserver/stats_over_http.so %%SITE_PERL%%/Apache/TS.pm %%SITE_PERL%%/Apache/TS/AdminClient.pm @@ -85,7 +92,6 @@ libexec/trafficserver/stats_over_http.so %%PERL5_MAN3%%/Apache::TS.3.gz %%PERL5_MAN3%%/Apache::TS::AdminClient.3.gz %%PERL5_MAN3%%/Apache::TS::Config::Records.3.gz -man/man1/traffic_shell.1.gz @owner www %%ETCDIR%%/body_factory/default/.body_factory_info %%ETCDIR%%/body_factory/default/README @@ -138,70 +144,9 @@ man/man1/traffic_shell.1.gz @exec chown -f www %D/%%ETCDIR%%/snapshots @owner root %%ETCDIR%%/trafficserver-release -share/doc/trafficserver/trafficshell/config_alarms.1 -share/doc/trafficserver/trafficshell/config_cache.1 -share/doc/trafficserver/trafficshell/config_clock.1 -share/doc/trafficserver/trafficshell/config_dns.1 -share/doc/trafficserver/trafficshell/config_get.1 -share/doc/trafficserver/trafficshell/config_hard-restart.1 -share/doc/trafficserver/trafficshell/config_hostdb.1 -share/doc/trafficserver/trafficshell/config_http.1 -share/doc/trafficserver/trafficshell/config_icp.1 -share/doc/trafficserver/trafficshell/config_logging.1 -share/doc/trafficserver/trafficshell/config_name.1 -share/doc/trafficserver/trafficshell/config_network.1 -share/doc/trafficserver/trafficshell/config_parent.1 -share/doc/trafficserver/trafficshell/config_port-tunnels.1 -share/doc/trafficserver/trafficshell/config_remap.1 -share/doc/trafficserver/trafficshell/config_reset-stats.1 -share/doc/trafficserver/trafficshell/config_restart.1 -share/doc/trafficserver/trafficshell/config_root.1 -share/doc/trafficserver/trafficshell/config_scheduled-update.1 -share/doc/trafficserver/trafficshell/config_security.1 -share/doc/trafficserver/trafficshell/config_set.1 -share/doc/trafficserver/trafficshell/config_socks.1 -share/doc/trafficserver/trafficshell/config_ssl.1 -share/doc/trafficserver/trafficshell/config_start.1 -share/doc/trafficserver/trafficshell/config_stop.1 -share/doc/trafficserver/trafficshell/config_upgrade.1 -share/doc/trafficserver/trafficshell/config_virtual-ip.1 -share/doc/trafficserver/trafficshell/disable.1 -share/doc/trafficserver/trafficshell/enable.1 -share/doc/trafficserver/trafficshell/exit.1 -share/doc/trafficserver/trafficshell/show_alarms.1 -share/doc/trafficserver/trafficshell/show_cache-stats.1 -share/doc/trafficserver/trafficshell/show_cache.1 -share/doc/trafficserver/trafficshell/show_cluster.1 -share/doc/trafficserver/trafficshell/show_dns-resolver.1 -share/doc/trafficserver/trafficshell/show_dns-stats.1 -share/doc/trafficserver/trafficshell/show_hostdb-stats.1 -share/doc/trafficserver/trafficshell/show_hostdb.1 -share/doc/trafficserver/trafficshell/show_http-stats.1 -share/doc/trafficserver/trafficshell/show_http-trans-stats.1 -share/doc/trafficserver/trafficshell/show_http.1 -share/doc/trafficserver/trafficshell/show_icp-stats.1 -share/doc/trafficserver/trafficshell/show_icp.1 -share/doc/trafficserver/trafficshell/show_logging-stats.1 -share/doc/trafficserver/trafficshell/show_logging.1 -share/doc/trafficserver/trafficshell/show_network.1 -share/doc/trafficserver/trafficshell/show_parent.1 -share/doc/trafficserver/trafficshell/show_port-tunnels.1 -share/doc/trafficserver/trafficshell/show_proxy-stats.1 -share/doc/trafficserver/trafficshell/show_proxy.1 -share/doc/trafficserver/trafficshell/show_remap.1 -share/doc/trafficserver/trafficshell/show_scheduled-update.1 -share/doc/trafficserver/trafficshell/show_security.1 -share/doc/trafficserver/trafficshell/show_socks.1 -share/doc/trafficserver/trafficshell/show_ssl.1 -share/doc/trafficserver/trafficshell/show_status.1 -share/doc/trafficserver/trafficshell/show_version.1 -share/doc/trafficserver/trafficshell/show_virtual-ip.1 @dirrm %%SITE_PERL%%/Apache/TS/Config @dirrm %%SITE_PERL%%/Apache/TS @dirrm %%SITE_PERL%%/Apache -@dirrm share/trafficserver -@dirrm share/doc/trafficserver/trafficshell -@dirrm share/doc/trafficserver @dirrm libexec/trafficserver @dirrm include/ts @dirrm include/atscppapi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407300759.s6U7x844072343>