tags 625870 + patch
thanks

Hi Christoph

This is not a real NMU. I prepared a patch for this, but had not 
tested. It changes the use of Digest::SHA1 with Digest::SHA and 
removes the libdigest-sha1-perl (Build-)Depends(-Indep).

Regards
Salvatore
diff -u mimedefang-2.71/configure mimedefang-2.71/configure
--- mimedefang-2.71/configure
+++ mimedefang-2.71/configure
@@ -3897,7 +3897,7 @@
 echo "${ECHO_T}Compile-time checking for Perl modules disabled" >&6; }
       HAVE_SPAM_ASSASSIN=yes
 else
-    for module in 'IO::Socket' 'MIME::Tools 5.410 ()' 'MIME::WordDecoder' 'Digest::SHA1' ; do
+    for module in 'IO::Socket' 'MIME::Tools 5.410 ()' 'MIME::WordDecoder' 'Digest::SHA' ; do
 	{ echo "$as_me:$LINENO: checking for Perl module $module" >&5
 echo $ECHO_N "checking for Perl module $module... $ECHO_C" >&6; }
 	(echo "use lib '$PERLINSTALLSITELIB'; use $module;" ; echo "exit(0);") | $PERL > /dev/null 2>&1
@@ -3910,8 +3910,8 @@
 echo "$as_me: WARNING: *** MIME::Tools version 5.410 or higher (5.411a recommended)" >&2;}
 	    { echo "$as_me:$LINENO: WARNING: *** MIME::WordDecoder" >&5
 echo "$as_me: WARNING: *** MIME::WordDecoder" >&2;}
-	    { echo "$as_me:$LINENO: WARNING: *** Digest::SHA1" >&5
-echo "$as_me: WARNING: *** Digest::SHA1" >&2;}
+	    { echo "$as_me:$LINENO: WARNING: *** Digest::SHA" >&5
+echo "$as_me: WARNING: *** Digest::SHA" >&2;}
 	    exit 1
 	fi
 	{ echo "$as_me:$LINENO: result: ok" >&5
diff -u mimedefang-2.71/mimedefang.pl.in mimedefang-2.71/mimedefang.pl.in
--- mimedefang-2.71/mimedefang.pl.in
+++ mimedefang-2.71/mimedefang.pl.in
@@ -69,7 +69,7 @@
 use IO::File;
 use MIME::Tools 5.410 ();
 use MIME::Words qw(:all);
-use Digest::SHA1;
+use Digest::SHA;
 use Time::Local;
 use MIME::Parser;
 use Sys::Hostname;
@@ -5367,7 +5367,7 @@
 	# And print Perl module versions
 	print("\n");
 	my($version);
-	foreach $thing (qw(Archive::Zip Digest::SHA1 HTML::Parser IO::Socket IO::Stringy MIME::Base64 MIME::Tools MIME::Words Mail::Mailer Mail::SpamAssassin Net::DNS Unix::Syslog )) {
+	foreach $thing (qw(Archive::Zip Digest::SHA HTML::Parser IO::Socket IO::Stringy MIME::Base64 MIME::Tools MIME::Words Mail::Mailer Mail::SpamAssassin Net::DNS Unix::Syslog )) {
 	    unless (eval "require $thing") {
 		printf("%-30s: missing\n", $thing);
 		next;
@@ -6567,7 +6567,7 @@
     return 0 unless defined($path);
     open(IN, "<$path") or return 0;
 
-    $ctx = Digest::SHA1->new;
+    $ctx = Digest::SHA->new;
     $ctx->addfile(*IN);
     $ctx->add($salt) if defined($salt);
     close(IN);
diff -u mimedefang-2.71/debian/changelog mimedefang-2.71/debian/changelog
--- mimedefang-2.71/debian/changelog
+++ mimedefang-2.71/debian/changelog
@@ -1,3 +1,11 @@
+mimedefang (2.71-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Use Digest::SHA instead of Digest::SHA1. Remove libdigest-sha1-perl from
+    (Build-)Depends (Closes: #625870).
+
+ -- Salvatore Bonaccorso <car...@debian.org>  Mon, 25 Jul 2011 15:22:43 +0200
+
 mimedefang (2.71-1) unstable; urgency=low
 
   * New upstream release
diff -u mimedefang-2.71/debian/control mimedefang-2.71/debian/control
--- mimedefang-2.71/debian/control
+++ mimedefang-2.71/debian/control
@@ -2,12 +2,12 @@
 Section: mail
 Priority: extra
 Maintainer: Christoph Martin <christoph.mar...@uni-mainz.de>
-Build-Depends: debhelper (>= 5), po-debconf, libmilter-dev, bsd-mailx, libunix-syslog-perl, libperl-dev, libmime-tools-perl, libdigest-sha1-perl, libmail-spamassassin-perl, sanitizer, libhtml-parser-perl, libfile-scan-perl, libarchive-zip-perl
+Build-Depends: debhelper (>= 5), po-debconf, libmilter-dev, bsd-mailx, libunix-syslog-perl, libperl-dev, libmime-tools-perl, libmail-spamassassin-perl, sanitizer, libhtml-parser-perl, libfile-scan-perl, libarchive-zip-perl
 Standards-Version: 3.8.4
 
 Package: mimedefang
 Architecture: any
-Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, debconf (>= 0.5) | debconf-2.0, libmime-tools-perl, libio-stringy-perl, libmime-base64-perl, libmailtools-perl, libdigest-sha1-perl, libunix-syslog-perl, psmisc, adduser
+Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, debconf (>= 0.5) | debconf-2.0, libmime-tools-perl, libio-stringy-perl, libmime-base64-perl, libmailtools-perl, libunix-syslog-perl, psmisc, adduser
 Suggests: libmail-spamassassin-perl, sanitizer, libhtml-parser-perl, wv, libfile-scan-perl, clamav, libarchive-zip-perl, graphdefang, tk8.3 | wish, sendmail | postfix
 Description: e-mail filter program for sendmail
  MIMEDefang is an e-mail filter program which processes all messages sent
only in patch2:
unchanged:
--- mimedefang-2.71.orig/configure.in
+++ mimedefang-2.71/configure.in
@@ -141,7 +141,7 @@
    dnl for installation of spamassassin.cf
    HAVE_SPAM_ASSASSIN=yes
 else
-    for module in 'IO::Socket' 'MIME::Tools 5.410 ()' 'MIME::WordDecoder' 'Digest::SHA1' ; do
+    for module in 'IO::Socket' 'MIME::Tools 5.410 ()' 'MIME::WordDecoder' 'Digest::SHA' ; do
 	AC_MSG_CHECKING([for Perl module $module])
 	(echo "use lib '$PERLINSTALLSITELIB'; use $module;" ; echo "exit(0);") | $PERL > /dev/null 2>&1
 	if test $? != 0 ; then
@@ -149,7 +149,7 @@
 	    AC_MSG_WARN([*** Make sure the following Perl modules are installed:])
 	    AC_MSG_WARN([*** MIME::Tools version 5.410 or higher (5.411a recommended)])
 	    AC_MSG_WARN([*** MIME::WordDecoder])
-	    AC_MSG_WARN([*** Digest::SHA1])
+	    AC_MSG_WARN([*** Digest::SHA])
 	    exit 1
 	fi
 	AC_MSG_RESULT(ok)
only in patch2:
unchanged:
--- mimedefang-2.71.orig/gen-ip-validator.pl
+++ mimedefang-2.71/gen-ip-validator.pl
@@ -8,9 +8,9 @@
 #
 #***********************************************************************
 
-use Digest::SHA1;
+use Digest::SHA;
 
-$ctx = Digest::SHA1->new;
+$ctx = Digest::SHA->new;
 
 $data = "";
 for ($i=0; $i<256; $i++) {

Attachment: signature.asc
Description: Digital signature

Reply via email to