OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web openpkg$ Date: 23-Jun-2003 12:09:55 Branch: HEAD Handle: 2003062311095302 Modified files: openpkg-re/vcheck vc.rt openpkg-src/rt rt.patch rt.spec openpkg-web news.txt Log: upgrading package: rt 3.0.2 -> 3.0.3 Summary: Revision Changes Path 1.31 +2 -2 openpkg-re/vcheck/vc.rt 1.11 +17 -31 openpkg-src/rt/rt.patch 1.66 +4 -4 openpkg-src/rt/rt.spec 1.4952 +1 -0 openpkg-web/news.txt ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-re/vcheck/vc.rt ============================================================================ $ cvs diff -u -r1.30 -r1.31 vc.rt --- openpkg-re/vcheck/vc.rt 17 Jun 2003 17:55:06 -0000 1.30 +++ openpkg-re/vcheck/vc.rt 23 Jun 2003 10:09:53 -0000 1.31 @@ -2,7 +2,7 @@ } prog rt = { - version = 3-0-2 + version = 3-0-3 url = http://bestpractical.com/pub/rt/release/ regex = rt-([\d-]+)\.tar\.gz } @@ -55,7 +55,7 @@ regex = Test-Inline-(__VER__).tar.gz } prog rt:www-mechanize = { - version = 0.45 + version = 0.48 url = http://www.cpan.org/modules/by-authors/id/P/PE/PETDANCE/ regex = WWW-Mechanize-(__VER__).tar.g } @@ . patch -p0 <<'@@ .' Index: openpkg-src/rt/rt.patch ============================================================================ $ cvs diff -u -r1.10 -r1.11 rt.patch --- openpkg-src/rt/rt.patch 20 May 2003 08:43:59 -0000 1.10 +++ openpkg-src/rt/rt.patch 23 Jun 2003 10:09:55 -0000 1.11 @@ -96,9 +96,9 @@ <%ARGS> $user => "" $pass => undef ---- lib/RT/Ticket_Overlay.pm.dist 2003-05-15 12:39:54.000000000 +0200 -+++ lib/RT/Ticket_Overlay.pm 2003-05-20 10:27:45.000000000 +0200 -@@ -1727,6 +1727,7 @@ +--- lib/RT/Ticket_Overlay.pm.dist Sat Jun 21 19:02:51 2003 ++++ lib/RT/Ticket_Overlay.pm Mon Jun 23 10:58:39 2003 +@@ -1718,6 +1718,7 @@ Returns true if the specified principal (or the one corresponding to the specified address) is a member of the group Type for this ticket. @@ -106,9 +106,9 @@ =cut sub IsWatcher { -@@ -2996,7 +2997,16 @@ - my $NewOwner = shift; - my $Type = shift || "Give"; +@@ -2778,7 +2779,16 @@ + my $self = shift; + my $MergeInto = shift; - unless ( $self->CurrentUserHasRight('ModifyTicket') ) { + # we want to allow to take over tickets from Nobody even @@ -124,45 +124,31 @@ return ( 0, $self->loc("Permission Denied") ); } -@@ -3047,10 +3057,14 @@ +@@ -3052,10 +3062,7 @@ # Delete the owner in the owner group, then add a new one - # TODO: is this safe? it's not how we really want the API to work + # TODO: is this safe? it's not how we really want the API to work # for most things, but it's fast. -- my ($del_id, $del_msg) = $self->OwnerGroup->MembersObj->First->Delete(); +- my ( $del_id, $del_msg ) = $self->OwnerGroup->MembersObj->First->Delete(); - unless ($del_id) { -+ # -+ # it is neither safe nor working -- mlelstv -+ # -> find old owner, add new owner, modify ticket, remove old owner -+ -+ my ( $old_owner ) = $self->OwnerGroup->MembersObj->First; -+ unless ($old_owner) { $RT::Handle->Rollback(); -- return(0, $self->loc("Could not change owner. "). $del_msg); -+ return(0, $self->loc("Could not find owner. ")); +- return ( 0, $self->loc("Could not change owner. ") . $del_msg ); } my ( $add_id, $add_msg ) = $self->OwnerGroup->_AddMember( -@@ -3058,7 +3072,7 @@ +@@ -3063,7 +3070,7 @@ InsideTransaction => 1 ); unless ($add_id) { $RT::Handle->Rollback(); -- return(0, $self->loc("Could not change owner. "). $add_msg); -+ return(0, $self->loc("Could not add owner. "). $add_msg); +- return ( 0, $self->loc("Could not change owner. ") . $add_msg ); ++ return ( 0, $self->loc("Could not add owner. ") . $add_msg ); } - - # We call set twice with slightly different arguments, so -@@ -3074,7 +3088,13 @@ + + # We call set twice with slightly different arguments, so +@@ -3080,7 +3087,6 @@ unless ($val) { $RT::Handle->Rollback; -- return(0, $self->loc("Could not change owner. "). $msg); -+ return(0, $self->loc("Could not set owner. "). $msg); -+ } -+ -+ my ($del_id, $del_msg) = $old_owner->Delete(); -+ unless ($del_id) { -+ $RT::Handle->Rollback(); -+ return(0, $self->loc("Could not remove owner. "). $del_msg); +- return ( 0, $self->loc("Could not change owner. ") . $msg ); } $RT::Handle->Commit(); @@ . patch -p0 <<'@@ .' Index: openpkg-src/rt/rt.spec ============================================================================ $ cvs diff -u -r1.65 -r1.66 rt.spec --- openpkg-src/rt/rt.spec 17 Jun 2003 17:55:07 -0000 1.65 +++ openpkg-src/rt/rt.spec 23 Jun 2003 10:09:55 -0000 1.66 @@ -26,12 +26,12 @@ # FIXME: rse: Error: MM: mm:core: failed to open semaphore file (Permission denied): OS: No such file or directory # package versions -%define V_real 3-0-2 -%define V_here 3.0.2 +%define V_real 3-0-3 +%define V_here 3.0.3 %define V_log_dispatch 2.04 %define V_html_mason 1.21 %define V_libapreq 1.1 -%define V_www_mechanize 0.45 +%define V_www_mechanize 0.48 %define V_mldbm 2.01 %define V_html_format 2.03 %define V_test_inline 0.15 @@ -49,7 +49,7 @@ Group: Database License: GPL Version: %{V_here} -Release: 20030617 +Release: 20030623 # package options %option with_color_primary 336699 @@ . patch -p0 <<'@@ .' Index: openpkg-web/news.txt ============================================================================ $ cvs diff -u -r1.4951 -r1.4952 news.txt --- openpkg-web/news.txt 23 Jun 2003 08:44:22 -0000 1.4951 +++ openpkg-web/news.txt 23 Jun 2003 10:09:54 -0000 1.4952 @@ -1,3 +1,4 @@ +23-Jun-2003: Upgraded package: P<rt-3.0.3-20030623> 23-Jun-2003: Upgraded package: P<mhonarc-2.6.4-20030623> 23-Jun-2003: Upgraded package: P<docbook-4.2-20030623> 22-Jun-2003: Upgraded package: P<perl-text-20030622-20030622> @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]