[pkg-bacula-commits] [bacula] 01/02: Revert "add debian/patches/fix-bsmtp-ipv6.patch (Closes: #742914)"

[Carsten Leonhardt]

This is an automated email from the git hooks/post-receive script.

cl-guest pushed a commit to branch master
in repository bacula.

commit 957aca137812edf4c35ec40f61660085b5c112d5
Author: Carsten Leonhardt <leo at debian.org>
Date:   Tue Jul 28 12:44:27 2015 +0200

    Revert "add debian/patches/fix-bsmtp-ipv6.patch (Closes: #742914)"
    
    This reverts commit cfec755cb2f65b6c22a90f5041d1fb5ebe381eb5.
    
    Upstream prefers to add the "-a" flag to the default configuration
    when calling bsmtp, we will follow that.
---
 debian/patches/fix-bsmtp-ipv6.patch | 16 ----------------
 debian/patches/series               |  1 -
 2 files changed, 17 deletions(-)

diff --git a/debian/patches/fix-bsmtp-ipv6.patch b/debian/patches/fix-bsmtp-ipv6.patch
deleted file mode 100644
index 38ecff5..0000000
--- a/debian/patches/fix-bsmtp-ipv6.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: fix bsmtp for IPv6-only hosts
-Author: Carsten Leonhardt <leo at carotec.de>
-Bug: http://bugs.bacula.org/view.php?id=2154
-Bug-Debian: https://bugs.debian.org/742914
-Last-Update: 2015-07-27
---- a/src/tools/bsmtp.c
-+++ b/src/tools/bsmtp.c
-@@ -83,7 +83,7 @@
- static int mailport = 25;
- static char my_hostname[MAXSTRING];
- static bool content_utf8 = false;
--static resolv_type default_resolv_type = RESOLV_PROTO_IPV4;
-+static resolv_type default_resolv_type = RESOLV_PROTO_ANY;
- 
- /*
-  * Take input that may have names and other stuff and strip
diff --git a/debian/patches/series b/debian/patches/series
index 065a498..e7740c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,4 +9,3 @@ fix-scriptdir-examples-devices.patch
 ppc64el-libtoolize.patch
 fix-src-tools-make-clean.patch
 fix-systemd-tmpfiles.d-location.patch
-fix-bsmtp-ipv6.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git