Your message dated Sun, 22 Jan 2006 08:27:49 -0800
with message-id <[EMAIL PROTECTED]>
and subject line Bug#325291: fixed in fam 2.7.0-9
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; 27 Aug 2005 11:48:05 +0000
>From [EMAIL PROTECTED] Sat Aug 27 04:48:05 2005
Return-path: <[EMAIL PROTECTED]>
Received: from 216.red-62-57-140.user.auna.net (khazad.dyndns.org) 
[62.57.140.216] 
        by spohr.debian.org with esmtp (Exim 3.36 1 (Debian))
        id 1E8zAJ-00037z-00; Sat, 27 Aug 2005 04:48:04 -0700
Received: from rmh by khazad.dyndns.org with local (Exim 4.52)
        id 1E90iN-000BA9-Q9; Sat, 27 Aug 2005 15:27:19 +0200
Content-Type: multipart/mixed; boundary="===============1173094148=="
MIME-Version: 1.0
From: Robert Millan <[EMAIL PROTECTED]>
To: Debian Bug Tracking System <[EMAIL PROTECTED]>
Subject: FTBFS on GNU/kFreeBSD
X-Mailer: reportbug 3.16
Date: Sat, 27 Aug 2005 15:27:17 +0200
Message-Id: <[EMAIL PROTECTED]>
Delivered-To: [EMAIL PROTECTED]
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-Level: 
X-Spam-Status: No, hits=-8.0 required=4.0 tests=BAYES_00,HAS_PACKAGE 
        autolearn=no version=2.60-bugs.debian.org_2005_01_02

This is a multi-part MIME message sent by reportbug.

--===============1173094148==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Package: fam
Severity: important
Tags: patch

Hi,

libfam fails to build on GNU/kFreeBSD due to unportable checking of sockaddr_un
structure (patch by Aurelien Jarno), and because the dnotify patch assumes that
(Linux-specific) dnotify support was enabled in a few places.

I'm attaching a patch for both issues.  As for the sockaddr_un part, it'd be
nice if you forwarded it to upstream.

Thank you.

-- System Information:
Debian Release: testing/unstable
Architecture: kfreebsd-i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: GNU/kFreeBSD 5.3-1
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ANSI_X3.4-1968) (ignored: LC_ALL 
set to C)

--===============1173094148==
Content-Type: text/x-c; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="kfreebsd-gnu.diff"

diff -Nur fam-2.7.0.old/debian/changelog fam-2.7.0/debian/changelog
--- fam-2.7.0.old/debian/changelog      2005-08-27 14:27:23.000000000 +0200
+++ fam-2.7.0/debian/changelog  2005-08-27 15:02:43.000000000 +0200
@@ -1,3 +1,9 @@
+fam (2.7.0-7.2+kbsd) unreleased; urgency=low
+
+  * GNU/kFreeBSD support.
+
+ -- Robert Millan <[EMAIL PROTECTED]>  Sat, 27 Aug 2005 15:02:34 +0200
+
 fam (2.7.0-7.2) unstable; urgency=low
 
   * #include <limits.h> instead of "limits.h" (Closes: 317839)
diff -Nur fam-2.7.0.old/debian/patches/01_dnotify.patch 
fam-2.7.0/debian/patches/01_dnotify.patch
--- fam-2.7.0.old/debian/patches/01_dnotify.patch       2005-08-27 
14:27:23.000000000 +0200
+++ fam-2.7.0/debian/patches/01_dnotify.patch   2005-08-27 14:58:56.000000000 
+0200
@@ -21,7 +21,7 @@
 +use_dnotify=false
 +AC_MSG_RESULT($have_dnotify)
 +
-+if test "$have_dnotify"; then
++if test "$have_dnotify" = "yes" ; then
 +        MONITOR_FUNCS=IMonNone
 +        AC_DEFINE(USE_DNOTIFY)
 +      use_dnotify=true
@@ -103,7 +103,7 @@
 unchanged:
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
 +++ fam-2.7.0/src/DNotify.c++  2005-05-05 22:08:43.000000000 -0700
-@@ -0,0 +1,655 @@
+@@ -0,0 +1,659 @@
 +//  Copyright (C) 2001 Red Hat, Inc.  All Rights Reserved.
 +//  Copyright (C) 1999 Silicon Graphics, Inc.  All Rights Reserved.
 +//  
@@ -127,6 +127,9 @@
 +//  with this program; if not, write the Free Software Foundation, Inc., 59
 +//  Temple Place - Suite 330, Boston MA 02111-1307, USA.
 +
++#include "config.h" /* USE_DNOTIFY */
++#ifdef USE_DNOTIFY
++
 +#define _GNU_SOURCE  
 +#include <fcntl.h>
 +
@@ -759,6 +762,7 @@
 +    }
 +}
 +
++#endif /* USE_DNOTIFY */
 only in patch2:
 unchanged:
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
@@ -911,11 +915,13 @@
 unchanged:
 --- fam-2.7.0.orig/src/Interest.c++    2003-01-18 06:18:12.000000000 -0800
 +++ fam-2.7.0/src/Interest.c++ 2005-05-05 22:08:42.000000000 -0700
-@@ -42,12 +42,21 @@
+@@ -42,12 +42,23 @@
  #include "Event.h"
  #include "FileSystem.h"
  #include "IMon.h"
++#ifdef USE_DNOTIFY
 +#include "DNotify.h"
++#endif
  #include "Log.h"
  #include "Pollster.h"
  #include "timeval.h"
@@ -934,7 +940,7 @@
  bool      Interest::xtab_verification = true;
  
  Interest::Interest(const char *name, FileSystem *fs, in_addr host, 
ExportVerification ev)
-@@ -59,11 +68,11 @@
+@@ -59,11 +70,11 @@
        myhost(host),
        mypath_exported_to_host(ev == NO_VERIFY_EXPORTED)
  {
@@ -951,7 +957,7 @@
      {   int rc = lstat(name, &old_stat);
        if (rc < 0)
        {   Log::info("can't lstat %s", name);
-@@ -100,7 +109,7 @@
+@@ -100,7 +111,7 @@
      }
  #endif
  
@@ -960,7 +966,7 @@
  }
  
  Interest::~Interest()
-@@ -128,7 +137,7 @@
+@@ -128,7 +139,7 @@
                pp = &p->hashlink;      // move to next element
            }
        if (!found_same)
@@ -969,7 +975,7 @@
      }
  }
  
-@@ -147,7 +156,7 @@
+@@ -147,7 +158,7 @@
  
          // Express interest.
          IMon::Status s = IMon::BAD;
@@ -978,7 +984,7 @@
          if (s != IMon::OK) {
              return true;
          }
-@@ -248,23 +257,23 @@
+@@ -248,23 +259,23 @@
  }
  
  void
diff -Nur fam-2.7.0.old/debian/patches/08_sockaddr_un.patch 
fam-2.7.0/debian/patches/08_sockaddr_un.patch
--- fam-2.7.0.old/debian/patches/08_sockaddr_un.patch   1970-01-01 
01:00:00.000000000 +0100
+++ fam-2.7.0/debian/patches/08_sockaddr_un.patch       2005-08-27 
15:23:45.000000000 +0200
@@ -0,0 +1,56 @@
+diff -ur fam-2.7.0.old/config.h.in fam-2.7.0/config.h.in
+--- fam-2.7.0.old/config.h.in  2005-08-27 15:07:39.000000000 +0200
++++ fam-2.7.0/config.h.in      2005-08-27 15:08:01.000000000 +0200
+@@ -76,6 +76,9 @@
+ /* Define to 1 if `sa_len' is member of `struct sockaddr'. */
+ #undef HAVE_STRUCT_SOCKADDR_SA_LEN
+ 
++/* Define to 1 if `sun_len' is member of `struct sockaddr_un'. */
++#undef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN
++
+ /* Define to 1 if you have the <syslog.h> header file. */
+ #undef HAVE_SYSLOG_H
+ 
+diff -ur fam-2.7.0.old/configure.ac fam-2.7.0/configure.ac
+--- fam-2.7.0.old/configure.ac 2005-08-27 15:07:39.000000000 +0200
++++ fam-2.7.0/configure.ac     2005-08-27 15:08:01.000000000 +0200
+@@ -72,7 +72,8 @@
+ AC_TYPE_PID_T
+ AC_TYPE_SIZE_T
+ AC_HEADER_TIME
+-AC_CHECK_MEMBERS(struct sockaddr.sa_len, struct sockaddr_un.sun_len)
++AC_CHECK_MEMBERS([struct sockaddr.sa_len],,, [#include <sys/socket.h>])
++AC_CHECK_MEMBERS([struct sockaddr_un.sun_len],,, [#include <sys/un.h>])
+ 
+ # Checks for library functions.
+ AC_FUNC_ERROR_AT_LINE
+diff -ur fam-2.7.0.old/src/Listener.c++ fam-2.7.0/src/Listener.c++
+--- fam-2.7.0.old/src/Listener.c++     2005-08-27 15:07:39.000000000 +0200
++++ fam-2.7.0/src/Listener.c++ 2005-08-27 15:08:01.000000000 +0200
+@@ -209,7 +209,7 @@
+ #endif
+ 
+     char *tmpfile = tempnam("/tmp", ".fam");
+-#ifdef HAVE_SOCKADDR_SUN_LEN
++#ifdef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN
+     sockaddr_un sun = { sizeof(sockaddr_un), AF_UNIX, "" };
+ #else
+     sockaddr_un sun = { AF_UNIX, "" };
+@@ -283,7 +283,7 @@
+ 
+     // Get the new socket.
+ 
+-#ifdef HAVE_SOCKADDR_SUN_LEN
++#ifdef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN
+     struct sockaddr_un sun = { sizeof(sockaddr_un), AF_UNIX, "" };
+ #else
+     struct sockaddr_un sun = { AF_UNIX, "" };
+@@ -357,7 +357,7 @@
+ void
+ Listener::dirty_ugly_hack()
+ {
+-#ifdef HAVE_SOCKADDR_SUN_LEN
++#ifdef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN
+     static sockaddr_un sun = { sizeof (sockaddr_un), AF_UNIX, 
"/tmp/.fam_socket" };
+ #else
+     static sockaddr_un sun = { AF_UNIX, "/tmp/.fam_socket" };

--===============1173094148==--

---------------------------------------
Received: (at 325291-close) by bugs.debian.org; 22 Jan 2006 16:30:44 +0000
>From [EMAIL PROTECTED] Sun Jan 22 08:30:44 2006
Return-path: <[EMAIL PROTECTED]>
Received: from joerg by spohr.debian.org with local (Exim 4.50)
        id 1F0i4D-0000x7-GN; Sun, 22 Jan 2006 08:27:49 -0800
From: Chuan-kai Lin <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED]
X-Katie: lisa $Revision: 1.31 $
Subject: Bug#325291: fixed in fam 2.7.0-9
Message-Id: <[EMAIL PROTECTED]>
Sender: Joerg Jaspert <[EMAIL PROTECTED]>
Date: Sun, 22 Jan 2006 08:27:49 -0800
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-Level: 
X-Spam-Status: No, hits=-6.0 required=4.0 tests=BAYES_00,HAS_BUG_NUMBER 
        autolearn=no version=2.60-bugs.debian.org_2005_01_02
X-CrossAssassin-Score: 6

Source: fam
Source-Version: 2.7.0-9

We believe that the bug you reported is fixed in the latest version of
fam, which is due to be installed in the Debian FTP archive:

fam_2.7.0-9.diff.gz
  to pool/main/f/fam/fam_2.7.0-9.diff.gz
fam_2.7.0-9.dsc
  to pool/main/f/fam/fam_2.7.0-9.dsc
fam_2.7.0-9_i386.deb
  to pool/main/f/fam/fam_2.7.0-9_i386.deb
libfam-dev_2.7.0-9_i386.deb
  to pool/main/f/fam/libfam-dev_2.7.0-9_i386.deb
libfam0_2.7.0-9_i386.deb
  to pool/main/f/fam/libfam0_2.7.0-9_i386.deb
libfam0c102_2.7.0-9_all.deb
  to pool/main/f/fam/libfam0c102_2.7.0-9_all.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Chuan-kai Lin <[EMAIL PROTECTED]> (supplier of updated fam package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Mon, 16 Jan 2006 17:38:05 -0800
Source: fam
Binary: libfam0c102 libfam0 fam libfam-dev
Architecture: source i386 all
Version: 2.7.0-9
Distribution: unstable
Urgency: medium
Maintainer: Chuan-kai Lin <[EMAIL PROTECTED]>
Changed-By: Chuan-kai Lin <[EMAIL PROTECTED]>
Description: 
 fam        - File Alteration Monitor
 libfam-dev - Client library to control the FAM daemon - development files
 libfam0    - Client library to control the FAM daemon
 libfam0c102 - Dummy package for libfam0
Closes: 325291 327241 332665 332790 332847 335564 337645 339849 347876
Changes: 
 fam (2.7.0-9) unstable; urgency=medium
 .
   * Re-introduce the libfam0c102 dummy package to ensure that systems with
     libfam0c102 package installed only to satisfy dependency will also
     receive updates to new fam libraries.  Full story in README.Debian in
     the libfam0 package.  (closes: #327241, #335564, #332847)
   * Include stdlib.h to cure a FTBFS bug (fix by Daniel Schepler).
     (closes: #347876)
   * Include GNU/kFreeBSD compatibility patch (fix by Robert Millan and
     Aurelien Jarno).  (closes: #325291)
   * Make fam Depend on portmap again because fam cannot work without the
     portmapper, even in a local environment.  (closes: #332790, #332665)
   * Remove start-stop-daemon call.  (closes: #339849)
   * Add init script dependency description.  (closes: #337645)
Files: 
 52a70e0a4c00e13ad7d0156619f98574 644 admin optional fam_2.7.0-9.dsc
 2f078502c528fad080598f11a0efabd6 22534 admin optional fam_2.7.0-9.diff.gz
 aab883048f8c06981966a778d080fea3 12030 libs optional 
libfam0c102_2.7.0-9_all.deb
 2f5df8774d6bb521b9bacf4609260341 70940 admin optional fam_2.7.0-9_i386.deb
 2314ed07df8287b5260cf691c0ee38a0 27190 libs optional libfam0_2.7.0-9_i386.deb
 86f1052d14eeb1c48cce560f318d7bb8 38054 libdevel optional 
libfam-dev_2.7.0-9_i386.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)

iD8DBQFDzEstqq7AEt0PYmgRAj/BAKDIU2bCRBHVvTDyOyzGT46ZUVNvnACgtdSM
CtBwAZVitl/MavTaC8iCNZ8=
=qeuZ
-----END PGP SIGNATURE-----


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to