From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Dec 9 14:30:09 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 461C3106566B for ; Fri, 9 Dec 2011 14:30:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 220C68FC13 for ; Fri, 9 Dec 2011 14:30:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id pB9EU9FF092510 for ; Fri, 9 Dec 2011 14:30:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id pB9EU8ov092508; Fri, 9 Dec 2011 14:30:08 GMT (envelope-from gnats) Resent-Date: Fri, 9 Dec 2011 14:30:08 GMT Resent-Message-Id: <201112091430.pB9EU8ov092508@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Valery Komaorv Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A49951065670 for ; Fri, 9 Dec 2011 14:21:31 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 93E9F8FC1E for ; Fri, 9 Dec 2011 14:21:31 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id pB9ELUwK012542 for ; Fri, 9 Dec 2011 14:21:30 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id pB9ELUn6012541; Fri, 9 Dec 2011 14:21:30 GMT (envelope-from nobody) Message-Id: <201112091421.pB9ELUn6012541@red.freebsd.org> Date: Fri, 9 Dec 2011 14:21:30 GMT From: Valery Komaorv To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/163150: [patch][update] net/scribe X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Dec 2011 14:30:09 -0000 >Number: 163150 >Category: ports >Synopsis: [patch][update] net/scribe >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Dec 09 14:30:08 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Valery Komaorv >Release: FreeBSD 8.2-STABLE amd64 >Organization: >Environment: >Description: Update scribe to last version (work with last thrift/fb303 version) >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN ./scribe.orig/Makefile ./scribe/Makefile --- ./scribe.orig/Makefile 2011-05-19 05:32:18.000000000 +0400 +++ ./scribe/Makefile 2011-12-09 18:14:03.000000000 +0400 @@ -5,14 +5,18 @@ # PORTNAME= scribe -PORTVERSION= 2.2 -PORTREVISION= 3 +PORTVERSION= 2011.07.27 CATEGORIES= net -MASTER_SITES= http://cloud.github.com/downloads/facebook/scribe/ MAINTAINER= jnlin@csie.nctu.edu.tw COMMENT= Aggregating log data streamed in real time +MASTER_SITES= https://github.com/facebook/scribe/tarball/${GITVERSION}/ +DISTNAME= facebook-scribe-${GITVERSION} +GITVERSION= 6600084 +FETCH_ARGS= -pRr +WRKSRC= ${WRKDIR}/${DISTNAME} + BUILD_DEPENDS= fb303>0:${PORTSDIR}/devel/fb303 LIB_DEPENDS= boost_system:${PORTSDIR}/devel/boost-libs \ event:${PORTSDIR}/devel/libevent \ @@ -33,19 +37,12 @@ USE_PYTHON= yes USE_RC_SUBR= ${PORTNAME} -post-extract: - ${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} - post-patch: ${REINPLACE_CMD} -e 's|/usr/local/scribe|${LOCALBASE}/etc|' ${WRKSRC}/src/env_default.h -post-build: - ${LOCALBASE}/bin/thrift -o ${WRKSRC} -I ${LOCALBASE}/share --gen "perl" ${WRKSRC}/if/scribe.thrift - cd ${WRKSRC} && ${PATCH} < ${FILESDIR}/scribe.pm.patch - post-install: ${MKDIR} ${PREFIX}/${SITE_PERL_REL}/Scribe/Thrift - ${CP} ${WRKSRC}/gen-perl/*.pm ${PREFIX}/${SITE_PERL_REL}/Scribe/Thrift + ${CP} -R ${WRKSRC}/src/gen-perl/ ${PREFIX}/${SITE_PERL_REL} ${MKDIR} ${EXAMPLESDIR} ${CP} ${WRKSRC}/examples/* ${EXAMPLESDIR} diff -ruN ./scribe.orig/distinfo ./scribe/distinfo --- ./scribe.orig/distinfo 2011-03-20 15:52:55.000000000 +0300 +++ ./scribe/distinfo 2011-10-19 16:55:58.000000000 +0400 @@ -1,2 +1,2 @@ -SHA256 (scribe-2.2.tar.gz) = 960f92a1eeef64eaeb7465976c7e16e64dbc67fc61aa041072f23eb0915e4505 -SIZE (scribe-2.2.tar.gz) = 71223 +SHA256 (facebook-scribe-6600084.tar.gz) = a10b7d360bc2946d50d30b4e8e8fd0b1ba8338a45ac040b2373435d9d7ab21f5 +SIZE (facebook-scribe-6600084.tar.gz) = 97096 diff -ruN ./scribe.orig/files/patch-global_header.mk ./scribe/files/patch-global_header.mk --- ./scribe.orig/files/patch-global_header.mk 1970-01-01 03:00:00.000000000 +0300 +++ ./scribe/files/patch-global_header.mk 2011-10-19 18:33:45.000000000 +0400 @@ -0,0 +1,11 @@ +--- ./global_header.mk.orig 2011-06-27 09:59:22.000000000 +0400 ++++ ./global_header.mk 2011-10-19 18:00:32.000000000 +0400 +@@ -4,7 +4,7 @@ + #endef + + define thrift_template +-XTARGET := $(shell perl -e '@val = split("\/","$(2)"); $$last = pop(@val);split("\\.",$$last);print "$(1)/"."gen-cpp/"."@_[0]"."_types.cpp\n"' ) ++XTARGET := $(shell perl -e '@val = split("\/","$(2)");$$last = pop(@val);@fields = split("\\.",$$last);print "$(1)/gen-cpp/@fields[0]_types.cpp\n"') + + ifneq ($$(XBUILT_SOURCES),) + XBUILT_SOURCES := $$(XBUILT_SOURCES) $$(XTARGET) diff -ruN ./scribe.orig/files/patch-if__bucketupdater.thrift ./scribe/files/patch-if__bucketupdater.thrift --- ./scribe.orig/files/patch-if__bucketupdater.thrift 1970-01-01 03:00:00.000000000 +0300 +++ ./scribe/files/patch-if__bucketupdater.thrift 2011-10-19 18:33:45.000000000 +0400 @@ -0,0 +1,10 @@ +--- ./if/bucketupdater.thrift.orig 2011-06-27 09:59:22.000000000 +0400 ++++ ./if/bucketupdater.thrift 2011-10-19 18:33:32.000000000 +0400 +@@ -19,6 +19,7 @@ + + namespace cpp scribe.thrift + namespace java com.facebook.infrastructure.service ++namespace perl Scribe.Thrift + + // BucketStoreMapping service exception + exception BucketStoreMappingException { diff -ruN ./scribe.orig/files/patch-src__Makefile.am ./scribe/files/patch-src__Makefile.am --- ./scribe.orig/files/patch-src__Makefile.am 1970-01-01 03:00:00.000000000 +0300 +++ ./scribe/files/patch-src__Makefile.am 2011-10-19 18:33:45.000000000 +0400 @@ -0,0 +1,11 @@ +--- ./src/Makefile.am.orig 2011-06-27 09:59:22.000000000 +0400 ++++ ./src/Makefile.am 2011-10-19 18:00:32.000000000 +0400 +@@ -34,7 +34,7 @@ + # + THRIFT = $(thrift_home)/bin/thrift + THRIFT_INCLUDES = -I $(fb303_home)/share/ +-THRIFT_OPTS = $(THRIFT_INCLUDES) --gen cpp:pure_enums --gen py --gen php --gen java ++THRIFT_OPTS = $(THRIFT_INCLUDES) --gen cpp:pure_enums --gen py --gen php --gen java --gen perl + + # User defined conditionals and conditonal statements set up in configure.ac. + # FACEBOOK set in configure.ac diff -ruN ./scribe.orig/files/scribe.in ./scribe/files/scribe.in --- ./scribe.orig/files/scribe.in 2011-05-19 05:32:18.000000000 +0400 +++ ./scribe/files/scribe.in 2011-10-19 18:39:26.000000000 +0400 @@ -20,7 +20,7 @@ scribe_start() { echo "Starting ${name}." - /usr/sbin/daemon -cf -p ${pidfile} ${command} ${scribe_flags} + /usr/sbin/daemon -cf -p ${pidfile} ${command} ${scribe_flags} 2>>/var/log/scribe.log } scribe_cleanup() { diff -ruN ./scribe.orig/files/scribe.pm.patch ./scribe/files/scribe.pm.patch --- ./scribe.orig/files/scribe.pm.patch 2010-08-03 00:55:31.000000000 +0400 +++ ./scribe/files/scribe.pm.patch 1970-01-01 03:00:00.000000000 +0300 @@ -1,119 +0,0 @@ ---- gen-perl/scribe.pm.orig 2010-07-14 18:52:03.000000000 +0800 -+++ gen-perl/scribe.pm 2010-07-14 18:49:30.000000000 +0800 -@@ -8,14 +8,14 @@ - use warnings; - use Thrift; - --use Types; -+use Scribe::Thrift::Types; - use Facebook::FB303::FacebookService; - - # HELPER FUNCTIONS AND STRUCTURES - --package scribe_Log_args; -+package Scribe::Thrift::scribe_Log_args; - use base qw(Class::Accessor); --scribe_Log_args->mk_accessors( qw( messages ) ); -+Scribe::Thrift::scribe_Log_args->mk_accessors( qw( messages ) ); - - sub new { - my $classname = shift; -@@ -99,9 +99,9 @@ - return $xfer; - } - --package scribe_Log_result; -+package Scribe::Thrift::scribe_Log_result; - use base qw(Class::Accessor); --scribe_Log_result->mk_accessors( qw( success ) ); -+Scribe::Thrift::scribe_Log_result->mk_accessors( qw( success ) ); - - sub new { - my $classname = shift; -@@ -163,7 +163,7 @@ - return $xfer; - } - --package scribeIf; -+package Scribe::Thrift::scribeIf; - - use strict; - use base qw(Facebook::FB303::FacebookServiceIf); -@@ -175,7 +175,7 @@ - die 'implement interface'; - } - --package scribeRest; -+package Scribe::Thrift::scribeRest; - - use strict; - use base qw(Facebook::FB303::FacebookServiceRest); -@@ -187,10 +187,10 @@ - return $self->{impl}->Log($messages); - } - --package scribeClient; -+package Scribe::Thrift::scribeClient; - - use base qw(Facebook::FB303::FacebookServiceClient); --use base qw(scribeIf); -+use base qw(Scribe::Thrift::scribeIf); - sub new { - my ($classname, $input, $output) = @_; - my $self = {}; -@@ -211,7 +211,7 @@ - my $messages = shift; - - $self->{output}->writeMessageBegin('Log', TMessageType::CALL, $self->{seqid}); -- my $args = new scribe_Log_args(); -+ my $args = new Scribe::Thrift::scribe_Log_args(); - $args->{messages} = $messages; - $args->write($self->{output}); - $self->{output}->writeMessageEnd(); -@@ -232,7 +232,7 @@ - $self->{input}->readMessageEnd(); - die $x; - } -- my $result = new scribe_Log_result(); -+ my $result = new Scribe::Thrift::scribe_Log_result(); - $result->read($self->{input}); - $self->{input}->readMessageEnd(); - -@@ -241,7 +241,7 @@ - } - die "Log failed: unknown result"; - } --package scribeProcessor; -+package Scribe::Thrift::scribeProcessor; - - use strict; - use base qw(Facebook::FB303::FacebookServiceProcessor); ---- gen-perl/Constants.pm.orig 2010-07-14 18:52:03.000000000 +0800 -+++ gen-perl/Constants.pm 2010-07-14 18:49:30.000000000 +0800 -@@ -3,7 +3,7 @@ - # - # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - # --package Constants; -+package Scribe::Thrift::Constants; - require 5.6.0; - use strict; - use warnings; ---- gen-perl/Types.pm.orig 2010-07-14 18:52:03.000000000 +0800 -+++ gen-perl/Types.pm 2010-07-14 18:49:30.000000000 +0800 -@@ -8,12 +8,12 @@ - use warnings; - use Thrift; - --package ResultCode; -+package Scribe::Thrift::ResultCode; - use constant OK => 0; - use constant TRY_LATER => 1; --package LogEntry; -+package Scribe::Thrift::LogEntry; - use base qw(Class::Accessor); --LogEntry->mk_accessors( qw( category message ) ); -+Scribe::Thrift::LogEntry->mk_accessors( qw( category message ) ); - - sub new { - my $classname = shift; diff -ruN ./scribe.orig/pkg-plist ./scribe/pkg-plist --- ./scribe.orig/pkg-plist 2010-08-03 00:55:31.000000000 +0400 +++ ./scribe/pkg-plist 2011-10-19 18:35:52.000000000 +0400 @@ -1,13 +1,11 @@ -@comment $FreeBSD: ports/net/scribe/pkg-plist,v 1.1 2010/08/02 20:55:31 lwhsu Exp $ -%%EXAMPLESDIR%%/README -%%EXAMPLESDIR%%/example1.conf -%%EXAMPLESDIR%%/example2central.conf -%%EXAMPLESDIR%%/example2client.conf -%%EXAMPLESDIR%%/hdfs_example.conf -%%EXAMPLESDIR%%/hdfs_example2.conf -%%EXAMPLESDIR%%/scribe_cat -%%EXAMPLESDIR%%/scribe_ctrl -%%PYTHON_SITELIBDIR%%/scribe-2.0-%%PYTHON_VERSION_SHORTNAME%%.egg-info +bin/scribed +lib/libdynamicbucketupdater.a +lib/libscribe.a +%%SITE_PERL%%/Scribe/Thrift/BucketStoreMapping.pm +%%SITE_PERL%%/Scribe/Thrift/Constants.pm +%%SITE_PERL%%/Scribe/Thrift/Types.pm +%%SITE_PERL%%/Scribe/Thrift/scribe.pm +%%PYTHON_SITELIBDIR%%/scribe-2.0-py2.7.egg-info %%PYTHON_SITELIBDIR%%/scribe/__init__.py %%PYTHON_SITELIBDIR%%/scribe/__init__.pyc %%PYTHON_SITELIBDIR%%/scribe/constants.py @@ -16,12 +14,20 @@ %%PYTHON_SITELIBDIR%%/scribe/scribe.pyc %%PYTHON_SITELIBDIR%%/scribe/ttypes.py %%PYTHON_SITELIBDIR%%/scribe/ttypes.pyc -%%SITE_PERL%%/Scribe/Thrift/Constants.pm -%%SITE_PERL%%/Scribe/Thrift/Types.pm -%%SITE_PERL%%/Scribe/Thrift/scribe.pm -bin/scribed -lib/libscribe.a -@dirrmtry %%SITE_PERL%%/Scribe/Thrift -@dirrmtry %%SITE_PERL%%/Scribe -@dirrmtry %%PYTHON_SITELIBDIR%%/scribe -@dirrmtry %%EXAMPLESDIR%% +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example1.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example2central.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example2client.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hdfs_example.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hdfs_example2.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scribe_cat +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scribe_ctrl +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% +@dirrm %%PYTHON_SITELIBDIR%%/scribe +@dirrm %%PYTHON_SITELIBDIR%% +@dirrm lib/python2.7 +@dirrm %%SITE_PERL%%/Scribe/Thrift +@dirrm %%SITE_PERL%%/Scribe +@dirrm %%SITE_PERL%% +@dirrm lib/perl5/site_perl +@dirrm lib/perl5 >Release-Note: >Audit-Trail: >Unformatted: