From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Apr 20 15:30:01 2009 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 B26EB1065670 for ; Mon, 20 Apr 2009 15:30:01 +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 8BC068FC14 for ; Mon, 20 Apr 2009 15:30:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n3KFU1fQ087581 for ; Mon, 20 Apr 2009 15:30:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n3KFU1Cc087578; Mon, 20 Apr 2009 15:30:01 GMT (envelope-from gnats) Resent-Date: Mon, 20 Apr 2009 15:30:01 GMT Resent-Message-Id: <200904201530.n3KFU1Cc087578@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, Sergei Vyshenski Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 752F2106564A for ; Mon, 20 Apr 2009 15:25:29 +0000 (UTC) (envelope-from svysh@pn.sinp.msu.ru) Received: from vivaldi.pn.sinp.msu.ru (vivaldi.pn.sinp.msu.ru [213.131.11.26]) by mx1.freebsd.org (Postfix) with ESMTP id 08D8E8FC15 for ; Mon, 20 Apr 2009 15:25:28 +0000 (UTC) (envelope-from svysh@pn.sinp.msu.ru) Received: from vivaldi.pn.sinp.msu.ru (localhost [127.0.0.1]) by vivaldi.pn.sinp.msu.ru (8.14.3/8.14.3) with ESMTP id n3KFPKbt052914 for ; Mon, 20 Apr 2009 19:25:20 +0400 (MSD) (envelope-from svysh@vivaldi.pn.sinp.msu.ru) Received: (from svysh@localhost) by vivaldi.pn.sinp.msu.ru (8.14.3/8.14.3/Submit) id n3KFPKvi052913; Mon, 20 Apr 2009 19:25:20 +0400 (MSD) (envelope-from svysh) Message-Id: <200904201525.n3KFPKvi052913@vivaldi.pn.sinp.msu.ru> Date: Mon, 20 Apr 2009 19:25:20 +0400 (MSD) From: Sergei Vyshenski To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/133874: Maintainer update of devel/p5-Workflow X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Sergei Vyshenski List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Apr 2009 15:30:02 -0000 >Number: 133874 >Category: ports >Synopsis: Maintainer update of devel/p5-Workflow >Confidential: no >Severity: critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Apr 20 15:30:00 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Sergei Vyshenski >Release: FreeBSD 6.3-STABLE i386 >Organization: >Environment: System: FreeBSD vivaldi.pn.sinp.msu.ru 6.3-STABLE FreeBSD 6.3-STABLE #0: Tue Jun 17 17:04:04 MSD 2008 root@vivaldi.pn.sinp.msu.ru:/usr/obj/usr/src/sys/VIVALDI i386 >Description: Maintainer update of devel/p5-Workflow Fixing critical bug in the distribution by means of a "freebsd patch". Please create new directory "files" and place there a new file patch-lib-Workflow-Factory.pm I am submitting result of "diff -urN" command. Not sure what is a correct way to submit changes for a port when a new directory has to be created. >How-To-Repeat: >Fix: diff -urN p5-Workflow/Makefile p5-Workflow.new/Makefile --- p5-Workflow/Makefile 2009-01-29 23:17:13.000000000 +0300 +++ p5-Workflow.new/Makefile 2009-04-20 18:44:19.000000000 +0400 @@ -7,6 +7,7 @@ PORTNAME= Workflow PORTVERSION= 1.32 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff -urN p5-Workflow/files/patch-lib-Workflow-Factory.pm p5-Workflow.new/files/patch-lib-Workflow-Factory.pm --- p5-Workflow/files/patch-lib-Workflow-Factory.pm 1970-01-01 03:00:00.000000000 +0300 +++ p5-Workflow.new/files/patch-lib-Workflow-Factory.pm 2009-04-20 18:40:52.000000000 +0400 @@ -0,0 +1,74 @@ +--- lib/Workflow/Factory.pm.orig 2009-01-26 18:07:31.000000000 +0300 ++++ lib/Workflow/Factory.pm 2009-04-19 00:30:10.000000000 +0400 +@@ -1,6 +1,6 @@ + package Workflow::Factory; + +-# $Id: Factory.pm 454 2009-01-12 10:04:02Z jonasbn $ ++# $Id: Factory.pm 471 2009-04-18 20:29:51Z jonasbn $ + + use warnings; + use strict; +@@ -11,7 +11,7 @@ + use Carp qw(croak); + use English qw( -no_match_vars ); + +-$Workflow::Factory::VERSION = '1.18'; ++$Workflow::Factory::VERSION = '1.19'; + + my ($log); + my (%INSTANCES); +@@ -494,13 +494,20 @@ + foreach my $actions (@all_action_config) { + next unless ( ref $actions eq 'HASH' ); + +- # Handle optional type. ++ # TODO Handle optional type. + # Should we check here to see if this matches an existing + # workflow type? Maybe do a type check at the end of the config + # process? + my $type = exists $actions->{type} ? $actions->{type} : 'default'; + +- foreach my $action_config ( @{ $actions->{action} } ) { ++ my $a; ++ if ( exists $actions->{action} ) { ++ $a = $actions->{action}; ++ } else { ++ push @{$a}, $actions; ++ } ++ ++ foreach my $action_config ( @{$a} ) { + my $name = $action_config->{name}; + $log->is_debug + && $log->debug( +@@ -612,7 +619,14 @@ + my $type + = exists $conditions->{type} ? $conditions->{type} : 'default'; + +- foreach my $condition_config ( @{ $conditions->{condition} } ) { ++ my $c; ++ if ( exists $conditions->{condition} ) { ++ $c = $conditions->{condition}; ++ } else { ++ push @{$c}, $conditions; ++ } ++ ++ foreach my $condition_config ( @{$c} ) { + my $name = $condition_config->{name}; + $log->is_debug + && $log->debug("Adding configuration for condition '$name'"); +@@ -679,7 +693,14 @@ + foreach my $validators (@all_validator_config) { + next unless ( ref $validators eq 'HASH' ); + +- for my $validator_config ( @{ $validators->{validator} } ) { ++ my $v; ++ if ( exists $validators->{validator} ) { ++ $v = $validators->{validator}; ++ } else { ++ push @{$v}, $validators; ++ } ++ ++ for my $validator_config ( @{$v} ) { + my $name = $validator_config->{name}; + $log->is_debug + && $log->debug("Adding configuration for validator '$name'"); >Release-Note: >Audit-Trail: >Unformatted: