[Amavisd-new-commits] [SCM] Debian packaging for amavisd-new branch, master, updated. debian/1%2.6.4-4-15-gd7e2402

[Alexander Wirt]

The following commit has been merged in the master branch:
commit 3beda002bf73517ec95b05991034365b83f2d417
Author: Alexander Wirt <formorer at debian.org>
Date:   Tue Aug 9 09:15:14 2011 +0200

    remove 65_fixtldcheck.dpatch (included upstream)

diff --git a/debian/patches/00list b/debian/patches/00list
index f34731f..0f4243e 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -3,7 +3,6 @@
 40_fix_paths
 45_misc_doc_changes
 60-amavisd-snmp-subagent_paths
-65_fixtldcheck.dpatch
 70_fix_milter_permissions.dpatch
 85-clarify_fqdn_error.dpatch
 90_do_not_send_dsn_if_D_REJECT.dpatch
diff --git a/debian/patches/65_fixtldcheck.dpatch b/debian/patches/65_fixtldcheck.dpatch
deleted file mode 100755
index 9cf074e..0000000
--- a/debian/patches/65_fixtldcheck.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 65_allowdashintld.dpatch by Alexander Wirt <formorer at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Accept hostnames according to rfc2181
-
- at DPATCH@
-diff -urNad pkg-amavisd~/amavisd pkg-amavisd/amavisd
---- pkg-amavisd~/amavisd	2008-06-29 02:37:58.000000000 +0200
-+++ pkg-amavisd/amavisd	2008-07-24 20:34:28.000000000 +0200
-@@ -12957,7 +12957,7 @@
- do_log(0, "Perl version               %s", $]);
- # insist on a FQDN in $myhostname
- my($myhn) = c('myhostname');
--$myhn =~ /[^.]\.[a-zA-Z0-9]+\z/s || lc($myhn) eq 'localhost'
-+$myhn =~ /[^.]\..+\z/s || lc($myhn) eq 'localhost'
-   or die <<"EOD";
-   The value of variable \$myhostname is \"$myhn\", but should have been
-   a fully qualified domain name; perhaps uname(3) did not provide such.

-- 
Debian packaging for amavisd-new