[pkg-ggz-maintainers] Bug#526530: ggz-server: FTBFS: redefinition of 'struct flock'
Michael Banck
mbanck at debian.org
Sun Nov 29 11:40:09 UTC 2009
tags 526530 +pending
thanks
Hi,
I am shortly going to NMU with the attached interdiff.
Cheers,
Michael
-------------- next part --------------
diff -u ggz-server-0.0.14.1/debian/changelog ggz-server-0.0.14.1/debian/changelog
--- ggz-server-0.0.14.1/debian/changelog
+++ ggz-server-0.0.14.1/debian/changelog
@@ -1,3 +1,12 @@
+ggz-server (0.0.14.1-1.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/patches/inotify.diff: New patch switching to C library inotify
+ interface from the Linux kernel interface, taken from upstream revision
+ 10564 (Closes: #526530)
+
+ -- Michael Banck <mbanck at debian.org> Sun, 29 Nov 2009 12:34:31 +0100
+
ggz-server (0.0.14.1-1.2) unstable; urgency=low
* Non-maintainer upload.
only in patch2:
unchanged:
--- ggz-server-0.0.14.1.orig/debian/patches/inotify.diff
+++ ggz-server-0.0.14.1/debian/patches/inotify.diff
@@ -0,0 +1,192 @@
+diff -Naur ggz-server-0.0.14.1.orig/ggzd/control.c ggz-server-0.0.14.1/ggzd/control.c
+--- ggz-server-0.0.14.1.orig/ggzd/control.c 2008-01-05 20:03:09.000000000 +0100
++++ ggz-server-0.0.14.1/ggzd/control.c 2009-11-29 12:24:56.380983643 +0100
+@@ -60,13 +60,13 @@
+ #include "motd.h"
+ #include "parse_opt.h"
+ #include "players.h"
+-#include "reconfiguration.h"
+ #include "room.h"
+ #include "table.h"
+ #include "util.h"
+ #include "meta.h"
+
+ #ifdef HAVE_INOTIFY
++#include <sys/inotify.h>
+ #include <sys/ioctl.h>
+ #endif
+ #ifdef WITH_FAM
+@@ -78,6 +78,10 @@
+ #define HOST_NAME_MAX 256
+ #endif
+
++#ifdef HAVE_INOTIFY
++#define INOTIFY_EVENTSIZE sizeof(struct inotify_event)
++#endif
++
+ /* Server options */
+ Options opt;
+
+diff -Naur ggz-server-0.0.14.1.orig/ggzd/Makefile.am ggz-server-0.0.14.1/ggzd/Makefile.am
+--- ggz-server-0.0.14.1.orig/ggzd/Makefile.am 2008-02-14 19:04:42.000000000 +0100
++++ ggz-server-0.0.14.1/ggzd/Makefile.am 2009-11-29 12:24:56.384983036 +0100
+@@ -39,7 +39,6 @@
+ motd.h \
+ net.c \
+ net.h \
+- reconfiguration.h \
+ room.c \
+ room.h \
+ stats.c \
+diff -Naur ggz-server-0.0.14.1.orig/ggzd/reconfiguration.h ggz-server-0.0.14.1/ggzd/reconfiguration.h
+--- ggz-server-0.0.14.1.orig/ggzd/reconfiguration.h 2008-01-05 20:03:09.000000000 +0100
++++ ggz-server-0.0.14.1/ggzd/reconfiguration.h 1970-01-01 01:00:00.000000000 +0100
+@@ -1,135 +0,0 @@
+-/*
+- * File: reconfiguration.h
+- * Author: GGZ Development Team
+- * Project: GGZ Server
+- * Date: 2006-05-29
+- * Desc: Tools for dynamic reconfiguration of the server
+- * $Id: reconfiguration.h 8467 2006-08-04 01:58:46Z jdorje $
+- *
+- * Copyright (C) 2006 GGZ Development Team
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+- */
+-
+-#ifndef _GGZ_RECONFIGURATION_H
+-#define _GGZ_RECONFIGURATION_H
+-
+-#ifdef HAVE_INOTIFY
+-
+-#include <linux/inotify.h>
+-
+-/*#define IN_CREATE 0x00000100*/
+-#define IN_DELETE 0x00000200
+-#define IN_CLOSE_WRITE 0x00000008
+-
+-#define INOTIFY_EVENTSIZE sizeof(struct inotify_event)
+-
+-#define __u32 unsigned int
+-
+-/* now mostly stolen from the Linux::Inotify2 perl module */
+-/* this should eventually be available from glibc but isn't yet */
+-
+-#include <sys/syscall.h>
+-
+-#if defined(__i386__)
+-# define __NR_inotify_init 291
+-# define __NR_inotify_add_watch 292
+-# define __NR_inotify_rm_watch 293
+-#elif defined(__x86_64__)
+-# define __NR_inotify_init 253
+-# define __NR_inotify_add_watch 254
+-# define __NR_inotify_rm_watch 255
+-#elif defined(__powerpc__) || defined(__powerpc64__)
+-# define __NR_inotify_init 275
+-# define __NR_inotify_add_watch 276
+-# define __NR_inotify_rm_watch 277
+-#elif defined (__ia64__)
+-# define __NR_inotify_init 1277
+-# define __NR_inotify_add_watch 1278
+-# define __NR_inotify_rm_watch 1279
+-#elif defined (__s390__)
+-# define __NR_inotify_init 284
+-# define __NR_inotify_add_watch 285
+-# define __NR_inotify_rm_watch 286
+-#elif defined (__alpha__)
+-# define __NR_inotify_init 444
+-# define __NR_inotify_add_watch 445
+-# define __NR_inotify_rm_watch 446
+-#elif defined (__sparc__) || defined (__sparc64__)
+-# define __NR_inotify_init 151
+-# define __NR_inotify_add_watch 152
+-# define __NR_inotify_rm_watch 156
+-#elif defined (__arm__)
+-# define __NR_inotify_init 316
+-# define __NR_inotify_add_watch 317
+-# define __NR_inotify_rm_watch 318
+-#elif defined (__sh__)
+-# define __NR_inotify_init 290
+-# define __NR_inotify_add_watch 291
+-# define __NR_inotify_rm_watch 292
+-#elif defined (__mips__)
+-
+-#if _MIPS_SIM == _ABIO32
+-/*
+- * Linux o32 style syscalls are in the range from 4000 to 4999.
+- */
+-#define __NR_Linux 4000
+-#define __NR_inotify_init (__NR_Linux + 284)
+-#define __NR_inotify_add_watch (__NR_Linux + 285)
+-#define __NR_inotify_rm_watch (__NR_Linux + 286)
+-#endif
+-
+-#if _MIPS_SIM == _ABI64
+-/*
+- * Linux 64-bit syscalls are in the range from 5000 to 5999.
+- */
+-#define __NR_Linux 5000
+-#define __NR_inotify_init (__NR_Linux + 243)
+-#define __NR_inotify_add_watch (__NR_Linux + 244)
+-#define __NR_inotify_rm_watch (__NR_Linux + 245)
+-#endif
+-
+-#if _MIPS_SIM == _ABIN32
+-/*
+- * Linux N32 syscalls are in the range from 6000 to 6999.
+- */
+-#define __NR_Linux 6000
+-#define __NR_inotify_init (__NR_Linux + 247)
+-#define __NR_inotify_add_watch (__NR_Linux + 248)
+-#define __NR_inotify_rm_watch (__NR_Linux + 249)
+-#endif
+-
+-#else
+-# error "Unsupported architecture!"
+-#endif
+-
+-static inline int inotify_init (void)
+-{
+- return syscall (__NR_inotify_init);
+-}
+-
+-static inline int inotify_add_watch (int fd, const char *name, __u32 mask)
+-{
+- return syscall (__NR_inotify_add_watch, fd, name, mask);
+-}
+-
+-static inline int inotify_rm_watch (int fd, __u32 wd)
+-{
+- return syscall (__NR_inotify_rm_watch, fd, wd);
+-}
+-
+-#endif
+-
+-#endif
+diff -Naur ggz-server-0.0.14.1.orig/m4/reconfiguration.m4 ggz-server-0.0.14.1/m4/reconfiguration.m4
+--- ggz-server-0.0.14.1.orig/m4/reconfiguration.m4 2008-01-05 20:02:52.000000000 +0100
++++ ggz-server-0.0.14.1/m4/reconfiguration.m4 2009-11-29 12:24:56.380983643 +0100
+@@ -75,8 +75,7 @@
+ AC_DEFUN([AC_GGZ_RECONFIGURATION_INOTIFY],
+ [
+ AC_MSG_CHECKING([for inotify])
+- #AC_EGREP_HEADER([__NR_inotify_init], [/usr/include/bits/syscall.h],
+- AC_EGREP_HEADER([inotify_event], [/usr/include/linux/inotify.h],
++ AC_EGREP_HEADER([inotify_event], [/usr/include/sys/inotify.h],
+ [
+ AC_MSG_RESULT(yes)
+ reconfiguration=inotify
More information about the pkg-ggz-maintainers
mailing list