commit otrs for openSUSE:11.3

9 May 2011

Hello community,

here is the log from the commit of package otrs for openSUSE:11.3
checked in at Mon May 9 01:24:46 CEST 2011.



--------

--- old-versions/11.3/UPDATES/all/otrs/otrs.changes	2010-12-14 08:34:21.000000000 +0100
+++ 11.3/otrs/otrs.changes	2011-05-07 11:51:40.000000000 +0200
@@ -1,0 +2,6 @@
+Sat May  7 09:49:23 UTC 2011 - chris@computersalat.de
+
+- fix for bnc#692384
+  o OSA-2011-01, http://otrs.org/advisory/OSA-2011-01-en/
+
+-------------------------------------------------------------------

calling whatdependson for 11.3-i586


New:
----
  otrs-2.4.9-CVE-2011-1518.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ otrs.spec ++++++
--- /var/tmp/diff_new_pack.4BVCfe/_old	2011-05-09 01:23:09.000000000 +0200
+++ /var/tmp/diff_new_pack.4BVCfe/_new	2011-05-09 01:23:09.000000000 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package otrs (Version 2.4.9)
+# spec file for package otrs
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@
 Name:           otrs
 Summary:        The Open Ticket Request System
 Version:        %{otrs_ver}
-Release:        0.<RELEASE1>
+Release:        0.<RELEASE5>
 License:        AGPLv3
 Group:          Productivity/Networking/Email/Utilities
 Url:            http://otrs.org/
@@ -40,6 +40,8 @@
 Source15:       itsm.README.de
 Source16:       ZZZAuto.pm
 Patch0:         %{name}-2.4.7-init.patch
+# Patch-Fix-Upstream: OSA-2011-01 http://otrs.org/advisory/OSA-2011-01-en/
+Patch1:         %{name}-2.4.9-CVE-2011-1518.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         %insserv_prereq %fillup_prereq 
@@ -90,7 +92,7 @@
 License:        AGPLv3
 Summary:        ITIL (R) focused IT service management
 Version:        %{itsm_ver}
-Release:        0.<RELEASE1>
+Release:        0.<RELEASE5>
 Group:          Productivity/Networking/Email/Utilities
 Requires:       %{name} >= 2.4.0
 Provides:       itsm OTRS::ITSM
@@ -115,6 +117,7 @@
 %prep
 %setup -q -n %{name}-%{otrs_ver} -a 1
 %patch0 -p1
+%patch1 -p1
 
 find -name ".cvsignore" -type f | xargs rm -fv
 pushd Kernel/Config/Files

++++++ otrs-2.4.9-CVE-2011-1518.patch ++++++
diff -ruN otrs-2.4.9-orig/Kernel/Output/HTML/Layout.pm otrs-2.4.9/Kernel/Output/HTML/Layout.pm
--- otrs-2.4.9-orig/Kernel/Output/HTML/Layout.pm	2010-09-22 13:54:00.000000000 +0200
+++ otrs-2.4.9/Kernel/Output/HTML/Layout.pm	2011-03-16 16:27:56.000000000 +0100
@@ -1,8 +1,8 @@
 # --
 # Kernel/Output/HTML/Layout.pm - provides generic HTML output
-# Copyright (C) 2001-2010 OTRS AG, http://otrs.org/
+# Copyright (C) 2001-2011 OTRS AG, http://otrs.org/
 # --
-# $Id: Layout.pm,v 1.176.2.23 2010/09/22 11:54:00 mg Exp $
+# $Id: Layout.pm,v 1.176.2.25 2011/03/16 15:27:56 mg Exp $
 # --
 # This software comes with ABSOLUTELY NO WARRANTY. For details, see
 # the enclosed file COPYING for license information (AGPL). If you
@@ -20,7 +20,7 @@
 use Kernel::System::HTMLUtils;
 
 use vars qw(@ISA $VERSION);
-$VERSION = qw($Revision: 1.176.2.23 $) [1];
+$VERSION = qw($Revision: 1.176.2.25 $) [1];
 
 =head1 NAME
 
@@ -1418,10 +1418,6 @@
             Type => 'Error',
             What => $_
         ) || '';
-        $Param{$Backend} = $Self->Ascii2Html(
-            Text           => $Param{$Backend},
-            HTMLResultMode => 1,
-        );
     }
     if ( !$Param{BackendMessage} && !$Param{BackendTraceback} ) {
         $Self->{LogObject}->Log(
@@ -1434,10 +1430,6 @@
                 Type => 'Error',
                 What => $_
             ) || '';
-            $Param{$Backend} = $Self->Ascii2Html(
-                Text           => $Param{$Backend},
-                HTMLResultMode => 1,
-            );
         }
     }
     if ( !$Param{Message} ) {
@@ -1461,10 +1453,6 @@
         Type => 'Error',
         What => 'Message',
         ) || '';
-    $Param{BackendMessage} = $Self->Ascii2Html(
-        Text           => $Param{BackendMessage},
-        HTMLResultMode => 1,
-    );
 
     if ( !$Param{Message} ) {
         $Param{Message} = $Param{BackendMessage};
@@ -4166,10 +4154,6 @@
             Type => 'Error',
             What => $_
         ) || '';
-        $Param{ 'Backend' . $_ } = $Self->Ascii2Html(
-            Text           => $Param{ 'Backend' . $_ },
-            HTMLResultMode => 1,
-        );
     }
     if ( !$Param{BackendMessage} && !$Param{BackendTraceback} ) {
         $Self->{LogObject}->Log(
@@ -4181,10 +4165,6 @@
                 Type => 'Error',
                 What => $_
             ) || '';
-            $Param{ 'Backend' . $_ } = $Self->Ascii2Html(
-                Text           => $Param{ 'Backend' . $_ },
-                HTMLResultMode => 1,
-            );
         }
     }
 
@@ -4208,10 +4188,6 @@
         Type => 'Error',
         What => 'Message',
         ) || '';
-    $Param{BackendMessage} = $Self->Ascii2Html(
-        Text           => $Param{BackendMessage},
-        HTMLResultMode => 1,
-    );
 
     if ( !$Param{Message} ) {
         $Param{Message} = $Param{BackendMessage};
@@ -4432,6 +4408,6 @@
 
 =head1 VERSION
 
-$Revision: 1.176.2.23 $ $Date: 2010/09/22 11:54:00 $
+$Revision: 1.176.2.25 $ $Date: 2011/03/16 15:27:56 $
 
 =cut
diff -ruN otrs-2.4.9-orig/Kernel/Output/HTML/Lite/Warning.dtl otrs-2.4.9/Kernel/Output/HTML/Lite/Warning.dtl
--- otrs-2.4.9-orig/Kernel/Output/HTML/Lite/Warning.dtl	2009-02-16 12:16:22.000000000 +0100
+++ otrs-2.4.9/Kernel/Output/HTML/Lite/Warning.dtl	2011-03-16 12:54:44.000000000 +0100
@@ -1,8 +1,8 @@
 # --
 # Warning.dtl - provides HTML warning screen
-# Copyright (C) 2001-2009 OTRS AG, http://otrs.org/
+# Copyright (C) 2001-2011 OTRS AG, http://otrs.org/
 # --
-# $Id: Warning.dtl,v 1.10 2009/02/16 11:16:22 tr Exp $
+# $Id: Warning.dtl,v 1.10.2.1 2011/03/16 11:54:44 mg Exp $
 # --
 # This software comes with ABSOLUTELY NO WARRANTY. For details, see
 # the enclosed file COPYING for license information (AGPL). If you
@@ -11,22 +11,22 @@
 
 <center>
 <table border="0" width="100%" cellspacing="0" cellpadding="3">
-  <tr>
-    <td class="contenthead">
-      <p>
-        <font color="red" size="+1">$Text{"Warning"}: $Data{"Message"}</font>
-      </p>
-    </td>
-  </tr>
-  <tr>
-    <td class="mainbody">
-      <table>
-        <tr>
-          <td class="table1" valign="top"><b>$Text{"Comment"}:</b></td>
-          <td class="table1" valign="top">$Text{"$Data{"Comment"}"}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
+    <tr>
+        <td class="contenthead">
+            <p>
+                <font color="red" size="+1">$Text{"Warning"}: $QData{"Message"}</font>
+            </p>
+        </td>
+    </tr>
+    <tr>
+        <td class="mainbody">
+            <table>
+                <tr>
+                    <td class="table1" valign="top"><b>$Text{"Comment"}:</b></td>
+                    <td class="table1" valign="top">$Text{"$Data{"Comment"}"}</td>
+                </tr>
+            </table>
+        </td>
+    </tr>
 </table>
 </center>
diff -ruN otrs-2.4.9-orig/Kernel/Output/HTML/Standard/CustomerError.dtl otrs-2.4.9/Kernel/Output/HTML/Standard/CustomerError.dtl
--- otrs-2.4.9-orig/Kernel/Output/HTML/Standard/CustomerError.dtl	2009-02-16 12:07:25.000000000 +0100
+++ otrs-2.4.9/Kernel/Output/HTML/Standard/CustomerError.dtl	2011-03-16 16:27:56.000000000 +0100
@@ -1,8 +1,8 @@
 # --
 # CustomerError.dtl - provides HTML Error screen
-# Copyright (C) 2001-2009 OTRS AG, http://otrs.org/
+# Copyright (C) 2001-2011 OTRS AG, http://otrs.org/
 # --
-# $Id: CustomerError.dtl,v 1.9 2009/02/16 11:07:25 tr Exp $
+# $Id: CustomerError.dtl,v 1.9.2.1 2011/03/16 15:27:56 mg Exp $
 # --
 # This software comes with ABSOLUTELY NO WARRANTY. For details, see
 # the enclosed file COPYING for license information (AGPL). If you
@@ -11,26 +11,26 @@
 
 <center>
 <table border="0" width="100%" cellspacing="0" cellpadding="3">
-  <tr>
-    <td class="mainhead">
-      <p>
-        <font color="red" size="+1">$Text{"Error"}: $Data{"Message"}</font>
-      </p>
-    </td>
-  </tr>
-  <tr>
-    <td class="menu">
-      <table cellspacing="0" cellpadding="2" width="100%">
-        <tr>
-          <td class="menu" valign="top" width="100"><b>$Text{"Comment"}:</b></td>
-          <td class="menu" valign="top">$Data{"Comment"}</td>
-        </tr>
-        <tr>
-          <td class="mainbody" valign="top"><b>$Text{"Traceback"}:</b></td>
-          <td class="mainbody" valign="top">$Data{"BackendTraceback"}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
+    <tr>
+        <td class="mainhead">
+            <p>
+                <font color="red" size="+1">$Text{"Error"}: $QData{"Message"}</font>
+            </p>
+        </td>
+    </tr>
+    <tr>
+        <td class="menu">
+            <table cellspacing="0" cellpadding="2" width="100%">
+                <tr>
+                    <td class="menu" valign="top" width="100"><b>$Text{"Comment"}:</b></td>
+                    <td class="menu" valign="top">$QData{"Comment"}</td>
+                </tr>
+                <tr>
+                    <td class="mainbody" valign="top"><b>$Text{"Traceback"}:</b></td>
+                    <td class="mainbody" valign="top"><pre>$QData{"BackendTraceback"}</pre></td>
+                </tr>
+            </table>
+        </td>
+    </tr>
 </table>
 </center>
diff -ruN otrs-2.4.9-orig/Kernel/Output/HTML/Standard/Error.dtl otrs-2.4.9/Kernel/Output/HTML/Standard/Error.dtl
--- otrs-2.4.9-orig/Kernel/Output/HTML/Standard/Error.dtl	2009-02-16 12:07:25.000000000 +0100
+++ otrs-2.4.9/Kernel/Output/HTML/Standard/Error.dtl	2011-03-16 12:54:44.000000000 +0100
@@ -1,8 +1,8 @@
 # --
 # Error.dtl - provides HTML Error screen
-# Copyright (C) 2001-2009 OTRS AG, http://otrs.org/
+# Copyright (C) 2001-2011 OTRS AG, http://otrs.org/
 # --
-# $Id: Error.dtl,v 1.19 2009/02/16 11:07:25 tr Exp $
+# $Id: Error.dtl,v 1.19.2.1 2011/03/16 11:54:44 mg Exp $
 # --
 # This software comes with ABSOLUTELY NO WARRANTY. For details, see
 # the enclosed file COPYING for license information (AGPL). If you
@@ -11,45 +11,45 @@
 
 <center>
 <table border="0" width="100%" cellspacing="0" cellpadding="3">
-  <tr>
-    <td class="contenthead">
-      <p>
-        <font color="red" size="+1">$Text{"Error"}: $Data{"Message"}</font>
-      </p>
-    </td>
-  </tr>
-  <tr>
-    <td class="mainbody">
-      <table cellspacing="0" cellpadding="2" width="100%">
-        <tr>
-          <td class="mainkey" width="100">$Text{"Comment"}:</td>
-          <td class="mainvalue">$Data{"Comment"}</td>
-        </tr>
-        <tr>
-          <td class="mainkey">$Text{"Bug Report"}:</td>
-          <td class="mainvalue">
-            <form action="http://bugs.otrs.org/enter_bug.cgi">
-              <input type="hidden" name="comment" value="
-              Message:
+    <tr>
+        <td class="contenthead">
+            <p>
+                <font color="red" size="+1">$Text{"Error"}: $QData{"Message"}</font>
+            </p>
+        </td>
+    </tr>
+    <tr>
+        <td class="mainbody">
+            <table cellspacing="0" cellpadding="2" width="100%">
+                <tr>
+                    <td class="mainkey" width="100">$Text{"Comment"}:</td>
+                    <td class="mainvalue">$QData{"Comment"}</td>
+                </tr>
+                <tr>
+                    <td class="mainkey">$Text{"Bug Report"}:</td>
+                    <td class="mainvalue">
+                        <form action="http://bugs.otrs.org/enter_bug.cgi">
+                            <input type="hidden" name="comment" value="
+                            Message:
 $Data{"Message"}
 
-              Comment:
+                            Comment:
 $Data{"Comment"}
 
-              Traceback:
+                            Traceback:
 $Data{"BackendTraceback"}
-              "/>
-              <input type="hidden" name="bug_file_loc" value="$QEnv{"SERVER_NAME"}$QEnv{"REQUEST_URI"}"/>
-              <input class="button" type="submit" value="$Text{"Click here to report a bug!"}"/>
-            </form>
-          </td>
-        </tr>
-        <tr>
-          <td class="mainkey">$Text{"Traceback"}:</td>
-          <td class="mainvalue">$Data{"BackendTraceback"}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
+                            "/>
+                            <input type="hidden" name="bug_file_loc" value="$QEnv{"SERVER_NAME"}$QEnv{"REQUEST_URI"}"/>
+                            <input class="button" type="submit" value="$Text{"Click here to report a bug!"}"/>
+                        </form>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="mainkey">$Text{"Traceback"}:</td>
+                    <td class="mainvalue">$QData{"BackendTraceback"}</td>
+                </tr>
+            </table>
+        </td>
+    </tr>
 </table>
 </center>
diff -ruN otrs-2.4.9-orig/Kernel/Output/HTML/Standard/Warning.dtl otrs-2.4.9/Kernel/Output/HTML/Standard/Warning.dtl
--- otrs-2.4.9-orig/Kernel/Output/HTML/Standard/Warning.dtl	2009-02-16 12:07:25.000000000 +0100
+++ otrs-2.4.9/Kernel/Output/HTML/Standard/Warning.dtl	2011-03-16 12:54:44.000000000 +0100
@@ -1,8 +1,8 @@
 # --
 # Warning.dtl - provides HTML warning screen
-# Copyright (C) 2001-2009 OTRS AG, http://otrs.org/
+# Copyright (C) 2001-2011 OTRS AG, http://otrs.org/
 # --
-# $Id: Warning.dtl,v 1.9 2009/02/16 11:07:25 tr Exp $
+# $Id: Warning.dtl,v 1.9.2.1 2011/03/16 11:54:44 mg Exp $
 # --
 # This software comes with ABSOLUTELY NO WARRANTY. For details, see
 # the enclosed file COPYING for license information (AGPL). If you
@@ -11,22 +11,22 @@
 
 <center>
 <table border="0" width="100%" cellspacing="0" cellpadding="3">
-  <tr>
-    <td class="contenthead">
-      <p>
-        <font color="red" size="+1">$Text{"Warning"}: $Data{"Message"}</font>
-      </p>
-    </td>
-  </tr>
-  <tr>
-    <td class="mainbody">
-      <table>
-        <tr>
-          <td class="table1" valign="top"><b>$Text{"Comment"}:</b></td>
-          <td class="table1" valign="top">$Text{"$Data{"Comment"}"}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
+    <tr>
+        <td class="contenthead">
+            <p>
+                <font color="red" size="+1">$Text{"Warning"}: $QData{"Message"}</font>
+            </p>
+        </td>
+    </tr>
+    <tr>
+        <td class="mainbody">
+            <table>
+                <tr>
+                    <td class="table1" valign="top"><b>$Text{"Comment"}:</b></td>
+                    <td class="table1" valign="top">$Text{"$Data{"Comment"}"}</td>
+                </tr>
+            </table>
+        </td>
+    </tr>
 </table>
 </center>

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)