Bug#262611: marked as done (FTBFS on GNU/Hurd (and GNU/k*BSD))
Debian Bug Tracking System
owner@bugs.debian.org
Thu, 03 Mar 2005 03:03:08 -0800
Your message dated Thu, 3 Mar 2005 11:52:59 +0100
with message-id <20050303105259.GA2925@khazad.dyndns.org>
and subject line Re: Patch for GNU/*BSD support
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--------------------------------------
Received: (at submit) by bugs.debian.org; 1 Aug 2004 03:36:50 +0000
>From rmh@khazad.dyndns.org Sat Jul 31 20:36:49 2004
Return-path: <rmh@khazad.dyndns.org>
Received: from 86.red-80-24-13.pooles.rima-tde.net (khazad.dyndns.org) [80.24.13.86]
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1Br79T-00020x-00; Sat, 31 Jul 2004 20:36:48 -0700
Received: from rmh by khazad.dyndns.org with local (Exim 3.36 #1 (Debian))
id 1Br795-0000YT-00; Sun, 01 Aug 2004 05:36:23 +0200
Content-Type: multipart/mixed; boundary="===============1300756864=="
MIME-Version: 1.0
From: Robert Millan <rmh@debian.org>
To: Debian Bug Tracking System <submit@bugs.debian.org>
Subject: FTBFS on GNU/Hurd (and GNU/k*BSD)
X-Mailer: reportbug 2.63
Date: Sun, 01 Aug 2004 05:36:23 +0200
Message-Id: <E1Br795-0000YT-00@khazad.dyndns.org>
Sender: <rmh@khazad.dyndns.org>
Delivered-To: submit@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-6.4 required=4.0 tests=BAYES_00,HAS_PACKAGE,
UPPERCASE_25_50 autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level:
This is a multi-part MIME message sent by reportbug.
--===============1300756864==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Package: exim4
Severity: important
Tags: patch sid
The attached patch fixes FTBFS on GNU/Hurd and GNU/k*BSD. I had the GNU
definitions in sync with GNU/Linux's, and then copied them for GNU/k*BSD
with some modifications.
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 2.4.26-1-k7
Locale: LANG=ca_ES@euro, LC_CTYPE=ca_ES@euro (ignored: LC_ALL set to C)
--===============1300756864==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="exim4_4.34-4.diff"
diff -Nur exim4-4.34.old/debian/patches/37_kbsd-gnu.dpatch exim4-4.34/debian/patches/37_kbsd-gnu.dpatch
--- exim4-4.34.old/debian/patches/37_kbsd-gnu.dpatch 1970-01-01 01:00:00.000000000 +0100
+++ exim4-4.34/debian/patches/37_kbsd-gnu.dpatch 2004-08-01 04:25:49.000000000 +0200
@@ -0,0 +1,249 @@
+#! /bin/sh -e
+## 37_kbsd-gnu.dpatch by Robert Millan <rmh@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: GNU and GNU/k*BSD porting fixes.
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+case "$1" in
+ -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+ -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -Nur exim4-4.34.old/OS/Makefile-GNU exim4-4.34/OS/Makefile-GNU
+--- exim4-4.34.old/OS/Makefile-GNU 2004-08-01 04:16:31.000000000 +0200
++++ exim4-4.34/OS/Makefile-GNU 2004-08-01 04:19:06.000000000 +0200
+@@ -1,6 +1,12 @@
+-# Exim: OS-specific make file for GNU/Hurd.
++# Exim: OS-specific make file for GNU and variants.
++
++HAVE_ICONV=yes
+
+ BASENAME_COMMAND=look_for_it
++CHOWN_COMMAND=look_for_it
++CHGRP_COMMAND=look_for_it
++
++CFLAGS ?= -O -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+ DBMLIB = -ldb
+ USE_DB = yes
+@@ -8,8 +14,6 @@
+ LIBS = -lnsl -lcrypt
+ LIBRESOLV = -lresolv
+
+-CFLAGS = -O2 -g -Wall
+-
+ X11=/usr/X11R6
+ XINCLUDE=-I$(X11)/include
+ XLFLAGS=-L$(X11)/lib
+@@ -17,6 +21,8 @@
+
+ EXIWHAT_PS_ARG=ax
+ EXIWHAT_EGREP_ARG='/exim( |$$)'
++EXIWHAT_MULTIKILL_CMD=killall
++EXIWHAT_MULTIKILL_ARG=exim4
+ EXIWHAT_KILL_SIGNAL=-USR1
+
+ # End
+diff -Nur exim4-4.34.old/OS/Makefile-GNUkFreeBSD exim4-4.34/OS/Makefile-GNUkFreeBSD
+--- exim4-4.34.old/OS/Makefile-GNUkFreeBSD 1970-01-01 01:00:00.000000000 +0100
++++ exim4-4.34/OS/Makefile-GNUkFreeBSD 2004-08-01 04:19:16.000000000 +0200
+@@ -0,0 +1,28 @@
++# Exim: OS-specific make file for GNU and variants.
++
++HAVE_ICONV=yes
++
++BASENAME_COMMAND=look_for_it
++CHOWN_COMMAND=look_for_it
++CHGRP_COMMAND=look_for_it
++
++CFLAGS ?= -O -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
++
++DBMLIB = -ldb
++USE_DB = yes
++
++LIBS = -lnsl -lcrypt
++LIBRESOLV = -lresolv
++
++X11=/usr/X11R6
++XINCLUDE=-I$(X11)/include
++XLFLAGS=-L$(X11)/lib
++X11_LD_LIB=$(X11)/lib
++
++EXIWHAT_PS_ARG=ax
++EXIWHAT_EGREP_ARG='/exim( |$$)'
++EXIWHAT_MULTIKILL_CMD=killall
++EXIWHAT_MULTIKILL_ARG=exim4
++EXIWHAT_KILL_SIGNAL=-USR1
++
++# End
+diff -Nur exim4-4.34.old/OS/Makefile-GNUkNetBSD exim4-4.34/OS/Makefile-GNUkNetBSD
+--- exim4-4.34.old/OS/Makefile-GNUkNetBSD 1970-01-01 01:00:00.000000000 +0100
++++ exim4-4.34/OS/Makefile-GNUkNetBSD 2004-08-01 04:19:19.000000000 +0200
+@@ -0,0 +1,28 @@
++# Exim: OS-specific make file for GNU and variants.
++
++HAVE_ICONV=yes
++
++BASENAME_COMMAND=look_for_it
++CHOWN_COMMAND=look_for_it
++CHGRP_COMMAND=look_for_it
++
++CFLAGS ?= -O -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
++
++DBMLIB = -ldb
++USE_DB = yes
++
++LIBS = -lnsl -lcrypt
++LIBRESOLV = -lresolv
++
++X11=/usr/X11R6
++XINCLUDE=-I$(X11)/include
++XLFLAGS=-L$(X11)/lib
++X11_LD_LIB=$(X11)/lib
++
++EXIWHAT_PS_ARG=ax
++EXIWHAT_EGREP_ARG='/exim( |$$)'
++EXIWHAT_MULTIKILL_CMD=killall
++EXIWHAT_MULTIKILL_ARG=exim4
++EXIWHAT_KILL_SIGNAL=-USR1
++
++# End
+diff -Nur exim4-4.34.old/OS/os.h-GNU exim4-4.34/OS/os.h-GNU
+--- exim4-4.34.old/OS/os.h-GNU 2004-08-01 04:16:31.000000000 +0200
++++ exim4-4.34/OS/os.h-GNU 2004-08-01 04:21:29.000000000 +0200
+@@ -1,13 +1,12 @@
+ /* Exim: OS-specific C header file for GNU/Hurd */
+
+ #define CRYPT_H
++#define GLIBC_IP_OPTIONS
+ #define HAVE_MMAP
++#define HAVE_BSD_GETLOADAVG
+ #define HAVE_SYS_VFS_H
+ #define NO_IP_VAR_H
+-#define NO_NET_IF_H
+-#define NO_FIND_INTERFACES
+-#define SETRLIMIT_NOT_SUPPORTED
+-#define GLIBC_IP_OPTIONS
++#define SIG_IGN_WORKS
+
+ #define F_FREESP O_TRUNC
+ typedef struct flock flock_t;
+@@ -15,4 +14,6 @@
+ #define os_strsignal strsignal
+ #define OS_STRSIGNAL
+
++/* Hurd-specific bits below */
++
+ /* End */
+diff -Nur exim4-4.34.old/OS/os.h-GNUkFreeBSD exim4-4.34/OS/os.h-GNUkFreeBSD
+--- exim4-4.34.old/OS/os.h-GNUkFreeBSD 1970-01-01 01:00:00.000000000 +0100
++++ exim4-4.34/OS/os.h-GNUkFreeBSD 2004-08-01 04:20:31.000000000 +0200
+@@ -0,0 +1,22 @@
++/* Exim: OS-specific C header file for GNU/kFreeBSD */
++
++#define CRYPT_H
++#define GLIBC_IP_OPTIONS
++#define HAVE_MMAP
++#define HAVE_BSD_GETLOADAVG
++#define HAVE_SYS_VFS_H
++#define NO_IP_VAR_H
++#define SIG_IGN_WORKS
++
++#define F_FREESP O_TRUNC
++typedef struct flock flock_t;
++
++#define os_strsignal strsignal
++#define OS_STRSIGNAL
++
++/* kFreeBSD-specific bits below */
++
++#define HAVE_SYS_MOUNT_H
++#define SIOCGIFCONF_GIVES_ADDR
++
++/* End */
+diff -Nur exim4-4.34.old/OS/os.h-GNUkNetBSD exim4-4.34/OS/os.h-GNUkNetBSD
+--- exim4-4.34.old/OS/os.h-GNUkNetBSD 1970-01-01 01:00:00.000000000 +0100
++++ exim4-4.34/OS/os.h-GNUkNetBSD 2004-08-01 04:20:31.000000000 +0200
+@@ -0,0 +1,22 @@
++/* Exim: OS-specific C header file for GNU/kNetBSD */
++
++#define CRYPT_H
++#define GLIBC_IP_OPTIONS
++#define HAVE_MMAP
++#define HAVE_BSD_GETLOADAVG
++#define HAVE_SYS_VFS_H
++#define NO_IP_VAR_H
++#define SIG_IGN_WORKS
++
++#define F_FREESP O_TRUNC
++typedef struct flock flock_t;
++
++#define os_strsignal strsignal
++#define OS_STRSIGNAL
++
++/* kNetBSD-specific bits below */
++
++#define HAVE_SYS_MOUNT_H
++#define SIOCGIFCONF_GIVES_ADDR
++
++/* End */
+diff -Nur exim4-4.34.old/OS/os.h-Linux exim4-4.34/OS/os.h-Linux
+--- exim4-4.34.old/OS/os.h-Linux 2004-08-01 04:16:31.000000000 +0200
++++ exim4-4.34/OS/os.h-Linux 2004-08-01 04:20:31.000000000 +0200
+@@ -3,11 +3,22 @@
+ #define CRYPT_H
+ #define GLIBC_IP_OPTIONS
+ #define HAVE_MMAP
++#define HAVE_BSD_GETLOADAVG
+ #define HAVE_SYS_VFS_H
+ #define NO_IP_VAR_H
+-#define SIOCGIFCONF_GIVES_ADDR
+ #define SIG_IGN_WORKS
+
++#define F_FREESP O_TRUNC
++typedef struct flock flock_t;
++
++#define os_strsignal strsignal
++#define OS_STRSIGNAL
++
++/* Linux-specific bits below */
++
++#define SIOCGIFCONF_GIVES_ADDR
++#define HAVE_SYS_MOUNT_H
++
+ /* Some versions of Linux need explicit sync-ing of directories as well as
+ files. This setting requests that. If the directory is on NFS, it may not
+ be possible to sync it - in that case, Exim now should ignore the error. But
+@@ -20,12 +31,6 @@
+ /* Other OS have "const" in here */
+ #define ICONV_ARG2_TYPE char **
+
+-#define F_FREESP O_TRUNC
+-typedef struct flock flock_t;
+-
+-#define os_strsignal strsignal
+-#define OS_STRSIGNAL
+-
+ #define os_find_running_interfaces os_find_running_interfaces_linux
+
+ /* Need a prototype for the Linux-specific function. The structure hasn't
+@@ -34,4 +39,9 @@
+ struct ip_address_item;
+ extern struct ip_address_item *os_find_running_interfaces_linux(void);
+
++/* Fudge added because this Linux doesn't appear to have a definition
++for ip_options in /usr/include/linux/ip.h. */
++
++#define ip_options options
++
+ /* End */
--===============1300756864==--
---------------------------------------
Received: (at 262611-done) by bugs.debian.org; 3 Mar 2005 10:59:04 +0000
>From rmh@debian.org Thu Mar 03 02:59:04 2005
Return-path: <rmh@debian.org>
Received: from 137.red-62-57-138.user.auna.net (khazad.dyndns.org) [62.57.138.137]
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1D6o2q-0001EI-00; Thu, 03 Mar 2005 02:59:04 -0800
Received: from rmh by khazad.dyndns.org with local (Exim 4.34)
id 1D6nwx-0001Rr-7T; Thu, 03 Mar 2005 11:52:59 +0100
Date: Thu, 3 Mar 2005 11:52:59 +0100
From: Robert Millan <rmh@debian.org>
To: Marc Haber <mh+debian-packages@zugschlus.de>
Cc: 262611-done@bugs.debian.org
Subject: Re: Re: Patch for GNU/*BSD support
Message-ID: <20050303105259.GA2925@khazad.dyndns.org>
References: <20050206132958.GA25912@lefler.int.l21.ma.zugschlus.de> <20050206135552.GA11195@khazad.dyndns.org> <20050206164527.GG7017@torres.l21.ma.zugschlus.de> <20050207144707.GA61294@khazad.dyndns.org> <20050207194721.GA3596@downhill.aus.cc> <20050207210817.GA30313@khazad.dyndns.org> <20050208175630.GB3892@downhill.aus.cc> <20050208214611.GA16472@lefler.int.l21.ma.zugschlus.de> <20050209103157.GA88518@khazad.dyndns.org> <20050226214846.GA3723@lefler.int.l21.ma.zugschlus.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20050226214846.GA3723@lefler.int.l21.ma.zugschlus.de>
Sender: Robert Millan <rmh@debian.org>
Organisation: free as in freedom
X-Operating-System: GNU/kFreeBSD
User-Agent: Mutt/1.5.6+20040722i
Delivered-To: 262611-done@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-3.0 required=4.0 tests=BAYES_00 autolearn=no
version=2.60-bugs.debian.org_2005_01_02
X-Spam-Level:
On Sat, Feb 26, 2005 at 10:48:46PM +0100, Marc Haber wrote:
> On Wed, Feb 09, 2005 at 11:31:57AM +0100, Robert Millan wrote:
> > On Tue, Feb 08, 2005 at 10:46:11PM +0100, Marc Haber wrote:
> > > On 2005-02-07 Robert Millan <rmh@debian.org> wrote:
> > > > Would you mind forwarding this patch?
> > >
> > > Do you want us to apply this one to the Debian package as well? Or
> > > should we wait for upstream to incorporate it?
> >
> > It's more important for me to merge it in upstream. That said, if you apply
> > it in the package that's fine too.
>
> >From my point of view, it looks like the patch is included in upstream
> 4.50. Can you please verify with the 4.50 packages in experimental and
> close this bug if appropriate?
Looks good, thanks!
--
.''`. Proudly running Debian GNU/kFreeBSD unstable/unreleased (on UFS2+S)
: :' :
`. `' http://www.debian.org/ports/kfreebsd-gnu
`-