[SCM] Debian packaging of libjifty-dbi-perl branch, squeeze, updated. 0eef5ac2494a31464ddaedcd0976e49218962eac

[gregor herrmann]

The following commit has been merged in the squeeze branch:
commit 0eef5ac2494a31464ddaedcd0976e49218962eac
Author: gregor herrmann <gregoa at debian.org>
Date:   Fri Jan 6 16:16:12 2012 +0100

    add yves' new minimal patch

diff --git a/debian/patches/libjifty-dbi-perl-shorter.debdiff b/debian/patches/libjifty-dbi-perl-yves.debdiff
similarity index 92%
copy from debian/patches/libjifty-dbi-perl-shorter.debdiff
copy to debian/patches/libjifty-dbi-perl-yves.debdiff
index b2b97c9..caf194f 100644
--- a/debian/patches/libjifty-dbi-perl-shorter.debdiff
+++ b/debian/patches/libjifty-dbi-perl-yves.debdiff
@@ -1,14 +1,12 @@
 diff -u libjifty-dbi-perl-0.60/debian/changelog libjifty-dbi-perl-0.60/debian/changelog
 --- libjifty-dbi-perl-0.60/debian/changelog
 +++ libjifty-dbi-perl-0.60/debian/changelog
-@@ -1,3 +1,11 @@
+@@ -1,3 +1,9 @@
 +libjifty-dbi-perl (0.60-1+squeeze1) UNRELEASED; urgency=high
 +
-+  * Team upload.
-+  * [SECURITY] Apply patch prepared by upstream that backports fixes for SQL
-+    injection weaknesses (closes: #622919).
++  * Security fix against SQL injection (Closes: #622919)
 +
-+ -- gregor herrmann <gregoa at debian.org>  Tue, 19 Apr 2011 23:53:52 +0200
++ -- AGOSTINI Yves <agostini at univ-metz.fr>  Fri, 15 Apr 2011 21:38:42 +0200
 +
  libjifty-dbi-perl (0.60-1) unstable; urgency=low
  
@@ -17,7 +15,7 @@ only in patch2:
 unchanged:
 --- libjifty-dbi-perl-0.60.orig/lib/Jifty/DBI/Collection.pm
 +++ libjifty-dbi-perl-0.60/lib/Jifty/DBI/Collection.pm
-@@ -1201,16 +1254,9 @@
+@@ -1201,16 +1201,9 @@
  
      # }}}
  
@@ -37,7 +35,7 @@ unchanged:
      my $class
          = $self->{joins}{ $args{alias} }
          && $self->{joins}{ $args{alias} }{class}
-@@ -1222,7 +1268,44 @@
+@@ -1222,7 +1215,44 @@
      $self->new_item->_apply_input_filters(
          column    => $column_obj,
          value_ref => \$args{'value'},
@@ -83,7 +81,7 @@ unchanged:
  
      # make passing in an object DTRT
      my $value_ref = ref( $args{value} );
-@@ -1248,27 +1337,28 @@
+@@ -1248,27 +1278,28 @@
      #since we're changing the search criteria, we need to redo the search
      $self->redo_search();
  
@@ -133,16 +131,7 @@ unchanged:
          }
      }
  
-@@ -1595,7 +1689,7 @@
-             $rowhash{'order'} = "ASC";
-         }
- 
--        if ( $rowhash{'function'} ) {
-+        if ( $rowhash{'function'} and not defined $rowhash{'column'} ) {
-             $clause .= ( $clause ? ", " : " " );
-             $clause .= $rowhash{'function'} . ' ';
-             $clause .= $rowhash{'order'};
-@@ -1603,11 +1697,17 @@
+@@ -1603,11 +1634,17 @@
          } elsif ( ( defined $rowhash{'alias'} )
              and ( $rowhash{'column'} ) )
          {
@@ -162,7 +151,7 @@ unchanged:
          }
      }
      $clause = " ORDER BY$clause " if $clause;
-@@ -1685,6 +1785,10 @@
+@@ -1685,6 +1722,10 @@
          } elsif ( ( $rowhash{'alias'} )
              and ( $rowhash{'column'} ) )
          {

-- 
Debian packaging of libjifty-dbi-perl