OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Michael Schloh
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-re           Date:   09-Sep-2003 17:35:40
  Branch: HEAD                             Handle: 2003090916353900

  Modified files:
    openpkg-re/vcheck       vc.rt
    openpkg-src/rt          rt.patch rt.spec

  Log:
    upgrading package: rt 3.0.4 -> 3.0.5

  Summary:
    Revision    Changes     Path
    1.47        +2  -2      openpkg-re/vcheck/vc.rt
    1.16        +16 -19     openpkg-src/rt/rt.patch
    1.96        +4  -4      openpkg-src/rt/rt.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-re/vcheck/vc.rt
  ============================================================================
  $ cvs diff -u -r1.46 -r1.47 vc.rt
  --- openpkg-re/vcheck/vc.rt   4 Sep 2003 13:15:09 -0000       1.46
  +++ openpkg-re/vcheck/vc.rt   9 Sep 2003 15:35:39 -0000       1.47
  @@ -2,7 +2,7 @@
   }
   
   prog rt = {
  -  version   = 3-0-4
  +  version   = 3-0-5
     url       = http://bestpractical.com/pub/rt/release/
     regex     = rt-([\d-]+)\.tar\.gz
   }
  @@ -12,7 +12,7 @@
     regex     = HTML-Format-(__VER__).tar.gz
   }
   prog rt:html-mason = {
  -  version   = 1.2200
  +  version   = 1.2300
     url       = http://www.cpan.org/modules/by-module/HTML/
     regex     = HTML-Mason-(__VER__)\.tar\.gz
     transform = "s/^(\\d+\\.\\d\\d)$/${1}00/; $_"
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/rt/rt.patch
  ============================================================================
  $ cvs diff -u -r1.15 -r1.16 rt.patch
  --- openpkg-src/rt/rt.patch   6 Aug 2003 12:05:50 -0000       1.15
  +++ openpkg-src/rt/rt.patch   9 Sep 2003 15:35:39 -0000       1.16
  @@ -1,17 +1,9 @@
  ---- lib/RT/User_Overlay.pm.dist      2003-08-05 16:22:34.000000000 +0200
  -+++ lib/RT/User_Overlay.pm   2003-08-05 16:29:17.000000000 +0200
  -@@ -203,7 +203,6 @@
  -         @_    # get the real argumentlist
  -     );
  - 
  --
  -     $args{'EmailAddress'} = $self->CanonicalizeEmailAddress($args{'EmailAddress'});
  - 
  -     #Check the ACL
  -@@ -274,7 +273,7 @@
  - 
  +--- lib/RT/User_Overlay.pm.dist      Tue Sep  9 17:16:16 2003
  ++++ lib/RT/User_Overlay.pm   Tue Sep  9 17:18:24 2003
  +@@ -279,7 +279,7 @@
        #If the create failed.
        unless ($id) {
  +         $RT::Handle->Rollback();
   -        $RT::Logger->error("Could not create a new user - " .join('-'. %args));
   +        $RT::Logger->error("Could not create a new user - " .join('-', %args));
    
  @@ -121,16 +113,21 @@
    <%ARGS>
    $user => ""
    $pass => undef
  ---- lib/RT/Attachment_Overlay.pm.dist        2003-08-06 13:01:15.000000000 +0200
  -+++ lib/RT/Attachment_Overlay.pm     2003-08-06 13:01:32.000000000 +0200
  -@@ -313,7 +313,9 @@
  +--- lib/RT/Attachment_Overlay.pm.dist        2003-09-08 20:18:38.000000000 +0200
  ++++ lib/RT/Attachment_Overlay.pm     2003-09-09 17:28:52.000000000 +0200
  +@@ -318,10 +318,11 @@
        # If we somehow fail to do the decode, at least push out the raw bits
        eval {return( Encode::decode_utf8($content))} || return ($content);
      }
  --  Encode::from_to($content, 'utf8' => $enc);
  +-  
  +-  eval { Encode::from_to($content, 'utf8' => $enc);};
  +-  if ($@) {
  +-    $RT::Logger->error("Could not convert attachment from assumed utf8 to '$enc' 
:".$@);
   +  if (!$enc) {
  -+    eval {Encode::from_to($content, 'utf8' => $enc);}
  -+  }
  ++    eval { Encode::from_to($content, 'utf8' => $enc);};
  ++    if ($@) {
  ++      $RT::Logger->error("Could not convert attachment from assumed utf8 to '$enc' 
:".$@);
  ++    }
  +   }
      return $content;
    }
  - 
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/rt/rt.spec
  ============================================================================
  $ cvs diff -u -r1.95 -r1.96 rt.spec
  --- openpkg-src/rt/rt.spec    4 Sep 2003 13:15:12 -0000       1.95
  +++ openpkg-src/rt/rt.spec    9 Sep 2003 15:35:39 -0000       1.96
  @@ -26,10 +26,10 @@
   #   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-4
  -%define       V_here                       3.0.4
  +%define       V_real                       3-0-5
  +%define       V_here                       3.0.5
   %define       V_log_dispatch               2.04
  -%define       V_html_mason                 1.22
  +%define       V_html_mason                 1.23
   %define       V_libapreq                   1.1
   %define       V_www_mechanize              0.59
   %define       V_mldbm                      2.01
  @@ -49,7 +49,7 @@
   Group:        Database
   License:      GPL
   Version:      %{V_here}
  -Release:      20030904
  +Release:      20030909
   
   #   package options
   %option       with_color_primary   336699
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to