Bug#409036: postfix: FTBFS on GNU/kFreeBSD

[Petr Salinger]

Package: postfix
Severity: important
Version: 2.3.6-2
Tags: patch

Hi,

the current version fails to build on GNU/kFreeBSD.

Please find attached patch to fix that.
It incorporates needed changes into debian/patches/30hurd.dpatch
and changes debian/rules to ignore failure of "make tidy".
On GNU/kFreeBSD and GNU/hurd it fails always when the 30hurd.dpatch
is not applied - i.e. also in the initial "clean".
See http://experimental.ftbfs.de/build.php?&pkg=postfix&arch=hurd-i386,
http://experimental.ftbfs.de/build.php?&pkg=postfix&arch=kfreebsd-i386.

Thanks in advance

                        Petr
diff -u postfix-2.3.6/debian/rules postfix-2.3.6/debian/rules
--- postfix-2.3.6/debian/rules
+++ postfix-2.3.6/debian/rules
@@ -198,7 +198,7 @@
        $(checkdir)
        dh_clean build
        test ! -d ${base} || rm -rf ${base}
-       $(MAKE) tidy
+       -$(MAKE) tidy
 
 clean: clean-preunpatch unpatch
        rm -rf debian/{files*,vars,*substvars,*.debhelper}
diff -u postfix-2.3.6/debian/patches/30hurd.dpatch 
postfix-2.3.6/debian/patches/30hurd.dpatch
--- postfix-2.3.6/debian/patches/30hurd.dpatch
+++ postfix-2.3.6/debian/patches/30hurd.dpatch
@@ -8,7 +8,7 @@
 diff -Nur postfix-2.2.9_old/makedefs postfix-2.2.9/makedefs
 --- postfix-2.2.9_old/makedefs 2006-01-03 22:50:25.000000000 +0100
 +++ postfix-2.2.9/makedefs     2006-03-11 13:12:49.000000000 +0100
-@@ -259,6 +259,38 @@
+@@ -259,6 +259,42 @@
                2.[0-3].*) CCARGS="$CCARGS -DNO_IPV6";;
                esac
                ;;
@@ -41,8 +41,12 @@
 +                      }
 +                  done
 +              done
-+              # currently no IPv6 support on Hurd
-+              CCARGS="$CCARGS -DNO_IPV6"
++              case "`uname -s`" in
++              GNU/Hurd)
++                      # currently no IPv6 support on Hurd
++                      CCARGS="$CCARGS -DNO_IPV6"
++                      ;;
++              esac
 +              ;;
       IRIX*.5.*)       SYSTYPE=IRIX5
                # Use the native compiler by default
@@ -50,7 +54,7 @@
 diff -Nur postfix-2.2.9_old/src/util/sys_defs.h 
postfix-2.2.9/src/util/sys_defs.h
 --- postfix-2.2.9_old/src/util/sys_defs.h      2006-01-03 22:52:17.000000000 
+0100
 +++ postfix-2.2.9/src/util/sys_defs.h  2006-03-11 14:29:44.000000000 +0100
-@@ -687,6 +687,62 @@
+@@ -687,6 +687,70 @@
  #endif
  
   /*
@@ -99,10 +103,18 @@
 +#endif
 +#define SOCKADDR_SIZE socklen_t
 +#define SOCKOPT_SIZE  socklen_t
++#ifdef __FreeBSD_kernel__
++# define HAS_DUPLEX_PIPE
++# define HAS_ISSETUGID
++#endif
 +#ifndef NO_IPV6
 +# define HAS_IPV6
-+# define HAS_PROCNET_IFINET6
-+# define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6"
++# ifdef __FreeBSD_kernel__
++#  define HAVE_GETIFADDRS
++# else
++#  define HAS_PROCNET_IFINET6
++#  define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6"
++# endif
 +#endif
 +#define CANT_USE_SEND_RECV_MSG
 +#define DEF_SMTP_CACHE_DEMAND 0