Re: pkgsrc-current Linux 2.6.24-1-686/i686 bulk build results 20081201.1911

[Aleksey Cheusov <cheusov%tut.by@localhost>]

>   security/policykit                     255 jmcneill%NetBSD.org@localhost
http://mova.org/~cheusov/pub/pkgsrc-distbb/Linux/current/logs/20081201.1911/security_policykit_policykit-0.9nb3/stage_build.html

There are three problems with this package.
1) linux/inotify.h is checked but never #include'ed
2) presense of linux/inotify.h is not enough to enable inotify functions
   on Linux. AFAIK glibc-2.5 or higher is needed, i.e.
   sys/inotify.h is required.
3) HAVE_INOTIFY define is not always checked properly in sources.

With the following patch this package is built for me.
Please review it. If it ok, apply in pkgsrc and resend to upstream.

? linux.patch
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/policykit/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile    26 Nov 2008 08:22:24 -0000      1.5
+++ Makefile    3 Dec 2008 20:29:10 -0000
@@ -30,9 +30,11 @@
 GNU_CONFIGURE=         YES
 USE_DIRS+=             xdg-1.4
 USE_PKGLOCALEDIR=      YES
-USE_TOOLS+=            gmake intltool msgfmt perl pkg-config
+USE_TOOLS+=            gmake intltool msgfmt perl pkg-config autoconf
 USE_LIBTOOL=           YES
 
+AUTOCONF_REQD=         2.59
+
 POLICYKIT_USER?=       polkit
 POLICYKIT_GROUP?=      polkit
 PKG_GROUPS=            ${POLICYKIT_GROUP}
@@ -47,6 +49,9 @@
 
 .include "../../mk/bsd.prefs.mk"
 
+pre-configure:
+       cd ${WRKSRC} && autoconf
+
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly"
 post-install:
        ${INSTALL_DATA} ${FILESDIR}/PolicyKit.conf.NetBSD 
${DESTDIR}${EGDIR}/PolicyKit.conf
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/security/policykit/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo    23 Nov 2008 22:28:23 -0000      1.3
+++ distinfo    3 Dec 2008 20:29:10 -0000
@@ -13,3 +13,5 @@
 SHA1 (patch-ah) = a1ae419a77bb3c8be02706bb67476af9443af92a
 SHA1 (patch-ai) = 9ec3744b394b0f6181a8a3367f0ce93e32b7fc4f
 SHA1 (patch-aj) = 596b9eb54173e25176ba0f363e4b2c4c137dd89f
+SHA1 (patch-ak) = 0f7ff03c58b6536f2d2985569e89f01d458cddc0
+SHA1 (patch-al) = 9f8ac0172e58122233e49977229362c2aaab3673
Index: patches/patch-ak
===================================================================
RCS file: patches/patch-ak
diff -N patches/patch-ak
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-ak    3 Dec 2008 20:29:10 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- configure.in.orig  2008-06-30 22:40:59.000000000 +0300
++++ configure.in
+@@ -528,7 +528,7 @@ case "$host_os" in
+ esac
+ 
+ have_inotify=no
+-AC_CHECK_HEADERS([linux/inotify.h], [have_inotify=yes])
++#AC_CHECK_HEADERS([linux/inotify.h], [have_inotify=yes])
+ AC_CHECK_HEADERS([sys/inotify.h], [have_inotify=yes])
+ 
+ AM_CONDITIONAL(HAVE_INOTIFY, test "x$have_inotify" = "xyes")
Index: patches/patch-al
===================================================================
RCS file: patches/patch-al
diff -N patches/patch-al
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-al    3 Dec 2008 20:29:10 -0000
@@ -0,0 +1,52 @@
+$NetBSD$
+
+--- src/polkit/polkit-context.c.orig   2008-05-31 00:24:44.000000000 +0300
++++ src/polkit/polkit-context.c
+@@ -219,7 +219,6 @@ polkit_context_init (PolKitContext *pk_c
+                         goto error;
+                 }
+ #endif
+-
+                 pk_context->inotify_fd_watch_id = 
pk_context->io_add_watch_func (pk_context, pk_context->inotify_fd);
+                 if (pk_context->inotify_fd_watch_id == 0) {
+                         polkit_debug ("failed to add io watch");
+@@ -310,6 +309,7 @@ polkit_context_init (PolKitContext *pk_c
+       }
+ #else
+         if (pk_context->io_add_watch_func != NULL) {
++#ifdef HAVE_INOTIFY
+                 pk_context->inotify_fd = inotify_init ();
+                 if (pk_context->inotify_fd < 0) {
+                         polkit_debug ("failed to initialize inotify: %s", 
strerror (errno));
+@@ -338,7 +338,6 @@ polkit_context_init (PolKitContext *pk_c
+                         /* TODO: set error */
+                         goto error;
+                 }
+-
+ #ifdef POLKIT_AUTHDB_DEFAULT
+                 /* Watch the /var/lib/misc/PolicyKit.reload file */
+                 pk_context->inotify_grant_perm_wd = inotify_add_watch 
(pk_context->inotify_fd, 
+@@ -351,13 +350,13 @@ polkit_context_init (PolKitContext *pk_c
+                         goto error;
+                 }
+ #endif
+-
+                 pk_context->inotify_fd_watch_id = 
pk_context->io_add_watch_func (pk_context, pk_context->inotify_fd);
+                 if (pk_context->inotify_fd_watch_id == 0) {
+                         polkit_debug ("failed to add io watch");
+                         /* TODO: set error */
+                         goto error;
+                 }
++#endif
+         }
+ #endif
+ 
+@@ -571,7 +570,7 @@ polkit_context_io_func (PolKitContext *p
+                       polkit_debug ("failed to read kqueue event: %s", 
strerror (errno));
+               }
+       }
+-#else
++#elif HAVE_INOTIFY
+         if (fd == pk_context->inotify_fd) {
+ /* size of the event structure, not counting name */
+ #define EVENT_SIZE  (sizeof (struct inotify_event))

-- 
Best regards, Aleksey Cheusov.