--- interchange-5.7.7.orig/code/Filter/sha1.filter +++ interchange-5.7.7/code/Filter/sha1.filter @@ -5,15 +5,15 @@ # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. See the LICENSE file for details. -Require module Digest::SHA1 +Require module Digest::SHA CodeDef sha1 Filter CodeDef sha1 Description sha1 sum CodeDef sha1 Routine < Fri, 22 Apr 2011 11:29:36 +0200 + * New upstream release. + * Add patch to use Digest::SHA instead of Digest::SHA1 (Closes: #625904, + thanks to Salvatore Bonaccorso for the report) + + -- Stefan Hornburg (Racke) Mon, 22 Aug 2011 11:57:41 +0200 interchange (5.7.6-2) unstable; urgency=low --- interchange-5.7.7.orig/debian/control +++ interchange-5.7.7/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Stefan Hornburg (Racke) Standards-Version: 3.5.6.0 -Build-Depends: debhelper (>= 5), po-debconf, libdigest-md5-perl, libdigest-sha1-perl, libmime-base64-perl, libsafe-hole-perl, libstorable-perl, liburi-perl, libhtml-parser-perl +Build-Depends: debhelper (>= 5), po-debconf, libdigest-md5-perl, libdigest-sha-perl, libmime-base64-perl, libsafe-hole-perl, libstorable-perl, liburi-perl, libhtml-parser-perl Homepage: http://www.icdevgroup.org/ Package: interchange-cat-standard @@ -28,7 +28,7 @@ Package: interchange Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, perl (>= 5.8.8), debconf | debconf-2.0, libdigest-md5-perl, libdigest-sha1-perl, libhtml-parser-perl, libmime-base64-perl, libsafe-hole-perl (>=0.06), libstorable-perl, liburi-perl, logrotate, libwww-perl, libset-crontab-perl, libtie-shadowhash-perl +Depends: ${misc:Depends}, ${shlibs:Depends}, perl (>= 5.8.8), debconf | debconf-2.0, libdigest-md5-perl, libdigest-sha-perl, libhtml-parser-perl, libmime-base64-perl, libsafe-hole-perl (>=0.06), libstorable-perl, liburi-perl, logrotate, libwww-perl, libset-crontab-perl, libtie-shadowhash-perl Pre-Depends: adduser Conflicts: libdbi-perl (<< 1.53) Recommends: interchange-ui --- interchange-5.7.7.orig/lib/Vend/UserDB.pm +++ interchange-5.7.7/lib/Vend/UserDB.pm @@ -34,16 +34,16 @@ my $ready = new Vend::Safe; -my $HAVE_SHA1; +my $HAVE_SHA; eval { - require Digest::SHA1; - import Digest::SHA1; - $HAVE_SHA1 = 1; + require Digest::SHA; + import Digest::SHA; + $HAVE_SHA = 1; }; if ($@) { - ::logGlobal("SHA1 passwords disabled: $@"); + ::logGlobal("SHA passwords disabled: $@"); } # The object encryption methods take three arguments: object, password, and @@ -100,11 +100,11 @@ sub enc_sha1 { my $obj = shift; - unless ($HAVE_SHA1) { - $obj->log_either('SHA1 passwords unavailable. Is Digest::SHA1 installed?'); + unless ($HAVE_SHA) { + $obj->log_either('SHA passwords unavailable. Is Digest::SHA installed?'); return; } - return Digest::SHA1::sha1_hex(shift); + return Digest::SHA::sha1_hex(shift); } # Maps the length of the encrypted data to the algorithm that